diff options
| author | Geir Storli <geirst@yahoo-inc.com> | 2017-07-13 15:08:43 +0000 |
|---|---|---|
| committer | Geir Storli <geirst@yahoo-inc.com> | 2017-07-13 15:08:43 +0000 |
| commit | ca54847aaf06439e6c593ee5e37e38337893d214 (patch) | |
| tree | 35f367ab39a3042500756863b44eb5827cc42f43 /searchcore/src/tests/proton/server/disk_mem_usage_filter | |
| parent | e7d625c96b84c8f318dfd37b90a1213167845ae9 (diff) | |
Log detailed messages when flipping between blocking/un-blocking write operations.
Diffstat (limited to 'searchcore/src/tests/proton/server/disk_mem_usage_filter')
| -rw-r--r-- | searchcore/src/tests/proton/server/disk_mem_usage_filter/disk_mem_usage_filter_test.cpp | 28 |
1 files changed, 12 insertions, 16 deletions
diff --git a/searchcore/src/tests/proton/server/disk_mem_usage_filter/disk_mem_usage_filter_test.cpp b/searchcore/src/tests/proton/server/disk_mem_usage_filter/disk_mem_usage_filter_test.cpp index a08a64cea8c..5d8a647f675 100644 --- a/searchcore/src/tests/proton/server/disk_mem_usage_filter/disk_mem_usage_filter_test.cpp +++ b/searchcore/src/tests/proton/server/disk_mem_usage_filter/disk_mem_usage_filter_test.cpp @@ -74,10 +74,9 @@ TEST_F("Check that disk limit can be reached", Fixture) f.triggerDiskLimit(); f.testWrite("diskLimitReached: { " "action: \"add more content nodes\", " - "reason: \"" - "disk used (0.9) > disk limit (0.8)" - "\", " - "capacity: 100, free: 20, available: 10, diskLimit: 0.8}"); + "reason: \"disk used (0.9) > disk limit (0.8)\", " + "stats: { " + "capacity: 100, free: 20, available: 10, diskUsed: 0.9, diskLimit: 0.8}}"); } TEST_F("Check that memory limit can be reached", Fixture) @@ -86,12 +85,11 @@ TEST_F("Check that memory limit can be reached", Fixture) f.triggerMemoryLimit(); f.testWrite("memoryLimitReached: { " "action: \"add more content nodes\", " - "reason: \"" - "memory used (0.875) > memory limit (0.8)" - "\", " + "reason: \"memory used (0.875) > memory limit (0.8)\", " + "stats: { " "mapped: { virt: 58720259, rss: 58720258}, " "anonymous: { virt: 58720257, rss: 58720256}, " - "physicalMemory: 67108864, memoryLimit : 0.8}"); + "physicalMemory: 67108864, memoryUsed: 0.875, memoryLimit: 0.8}}"); } TEST_F("Check that both disk limit and memory limit can be reached", Fixture) @@ -101,18 +99,16 @@ TEST_F("Check that both disk limit and memory limit can be reached", Fixture) f.triggerDiskLimit(); f.testWrite("memoryLimitReached: { " "action: \"add more content nodes\", " - "reason: \"" - "memory used (0.875) > memory limit (0.8)" - "\", " + "reason: \"memory used (0.875) > memory limit (0.8)\", " + "stats: { " "mapped: { virt: 58720259, rss: 58720258}, " "anonymous: { virt: 58720257, rss: 58720256}, " - "physicalMemory: 67108864, memoryLimit : 0.8}, " + "physicalMemory: 67108864, memoryUsed: 0.875, memoryLimit: 0.8}}, " "diskLimitReached: { " "action: \"add more content nodes\", " - "reason: \"" - "disk used (0.9) > disk limit (0.8)" - "\", " - "capacity: 100, free: 20, available: 10, diskLimit: 0.8}"); + "reason: \"disk used (0.9) > disk limit (0.8)\", " + "stats: { " + "capacity: 100, free: 20, available: 10, diskUsed: 0.9, diskLimit: 0.8}}"); } TEST_MAIN() { TEST_RUN_ALL(); } |