Fixed CI Pipeline Failures Involving the <stmgr_unittest> (#3735)

apache · Nov 15, 2021 · b295bf5 · b295bf5
1 parent 5038eba
commit b295bf5
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 9 deletions.
diff --git a/heron/stmgr/tests/cpp/server/stmgr_unittest.cpp b/heron/stmgr/tests/cpp/server/stmgr_unittest.cpp
@@ -972,14 +972,17 @@ TEST(StMgr, test_back_pressure_instance) {
   common.topology_name_ = "mytopology";
   common.topology_id_ = "abcd-9999";
   common.setNumStmgrs(2);
-  common.num_spouts_ = 2;
-  common.num_spout_instances_ = 1;
+  common.num_spouts_ = 4;
+  common.num_spout_instances_ = 4;
   common.num_bolts_ = 2;
   common.num_bolt_instances_ = 1;
   common.grouping_ = heron::proto::api::SHUFFLE;
   // Empty so that we don't attempt to connect to the zk
   // but instead connect to the local filesytem
   common.zkhostportlist_ = "";
+  // Overwrite the default values for back pressure
+  common.high_watermark_ = 1_MB;
+  common.low_watermark_ = 500_KB;
 
   int num_msgs_sent_by_spout_instance = 100 * 1000 * 1000;  // 100M
 
@@ -1083,14 +1086,17 @@ TEST(StMgr, test_spout_death_under_backpressure) {
   common.topology_name_ = "mytopology";
   common.topology_id_ = "abcd-9999";
   common.setNumStmgrs(2);
-  common.num_spouts_ = 1;
-  common.num_spout_instances_ = 2;
+  common.num_spouts_ = 4;
+  common.num_spout_instances_ = 4;
   common.num_bolts_ = 2;
   common.num_bolt_instances_ = 1;
   common.grouping_ = heron::proto::api::SHUFFLE;
   // Empty so that we don't attempt to connect to the zk
   // but instead connect to the local filesytem
   common.zkhostportlist_ = "";
+  // Overwrite the default values for back pressure
+  common.high_watermark_ = 1_MB;
+  common.low_watermark_ = 500_KB;
 
   int num_msgs_sent_by_spout_instance = 100 * 1000 * 1000;  // 100M
 
@@ -1340,14 +1346,17 @@ TEST(StMgr, test_back_pressure_stmgr_reconnect) {
   common.topology_name_ = "mytopology";
   common.topology_id_ = "abcd-9999";
   common.setNumStmgrs(2);
-  common.num_spouts_ = 2;
-  common.num_spout_instances_ = 1;
+  common.num_spouts_ = 4;
+  common.num_spout_instances_ = 4;
   common.num_bolts_ = 2;
   common.num_bolt_instances_ = 1;
   common.grouping_ = heron::proto::api::SHUFFLE;
   // Empty so that we don't attempt to connect to the zk
   // but instead connect to the local filesytem
   common.zkhostportlist_ = "";
+  // Overwrite the default values for back pressure
+  common.high_watermark_ = 1_MB;
+  common.low_watermark_ = 500_KB;
 
   int num_msgs_sent_by_spout_instance = 100 * 1000 * 1000;  // 100M
 

diff --git a/integration_test/src/python/local_test_runner/main.py b/integration_test/src/python/local_test_runner/main.py
@@ -54,7 +54,7 @@
 ]
 
 # The location of default configure file
-DEFAULT_TEST_CONF_FILE = "integration_test/src/python/local_test_runner/resources/test.conf"
+DEFAULT_TEST_CONF_FILE = "resources/test.conf"
 
 ProcessTuple = namedtuple('ProcessTuple', 'pid cmd')
 

diff --git a/integration_test/src/python/test_runner/main.py b/integration_test/src/python/test_runner/main.py
@@ -31,7 +31,7 @@
 from heron.common.src.python.utils import log
 
 # The location of default configure file
-DEFAULT_TEST_CONF_FILE = "integration_test/src/python/test_runner/resources/test.json"
+DEFAULT_TEST_CONF_FILE = "resources/test.json"
 
 RETRY_ATTEMPTS = 25
 #seconds

diff --git a/integration_test/src/python/topology_test_runner/main.py b/integration_test/src/python/topology_test_runner/main.py
@@ -34,7 +34,7 @@
 from heron.statemgrs.src.python.filestatemanager import FileStateManager
 
 # The location of default configure file
-DEFAULT_TEST_CONF_FILE = "integration_test/src/python/topology_test_runner/resources/test.json"
+DEFAULT_TEST_CONF_FILE = "resources/test.json"
 
 #seconds
 RETRY_ATTEMPTS = 50