Merge pull request #101 from splunk/FAST-11632

Fast 11632

Author: arctan5x

Makefile

@@ -58,7 +58,7 @@ test_collection_cleanup:
 	docker cp ${EVENTGEN_TEST_IMAGE}:$(shell pwd)/tests/functional_orca_test.log functional_orca_test.log || echo "no functional_orca_test.log"
 
 	@echo 'Stopping test container'
-	docker stop ${EVENTGEN_TEST_IMAGE}
+	docker stop ${EVENTGEN_TEST_IMAGE} || true
 
 clean:
 	rm *.spl || true
@@ -69,6 +69,7 @@ clean:
 	rm -rf docs/_book || true
 	rm -rf node_modules || true
 	rm -rf docs/node_modules || true
+	rm splunk_eventgen/default/eventgen_wsgi.conf || true
 	find . -name "*.pyc" -type f -delete || true
 	find . -name "*.log" -type f -delete || true
 	find . -name "*.pyc" -type f -delete || true

splunk_eventgen/__main__.py

@@ -275,9 +275,20 @@ def build_splunk_app(dest, source=os.getcwd(), remove=True):
         shutil.rmtree(directory)
     os.chdir(cwd)
 
+def convert_verbosity_count_to_logging_level(verbosity):
+    if verbosity == 0:
+        return logging.ERROR
+    elif verbosity == 1:
+        return logging.INFO
+    elif verbosity == 2:
+        return logging.DEBUG
+    else:
+        return logging.ERROR
+
 def main():
     cwd = os.getcwd()
     args = parse_args()
+    args.verbosity = convert_verbosity_count_to_logging_level(args.verbosity)
     if args.subcommand == "generate":
         eventgen = eventgen_core.EventGenerator(args=args)
         eventgen.start()

splunk_eventgen/eventgen_core.py

@@ -235,7 +235,7 @@ def _create_generator_workers(self, workercount=20):
     def _setup_loggers(self, args=None, config=None):
         log_path = getattr(args, "log_path", os.path.join(file_path, 'logs'))
         eventgen_main_logger_path = os.path.join(log_path, 'eventgen-main.log')
-        eventgen_listener_logger_path = os.path.join(log_path, 'eventgen-listener-process.log')
+        eventgen_controller_logger_path = os.path.join(log_path, 'eventgen-controller.log')
         eventgen_metrics_logger_path = os.path.join(log_path, 'eventgen-metrics.log')
         eventgen_error_logger_path = os.path.join(log_path, 'eventgen-errors.log')
         eventgen_server_logger_path = os.path.join(log_path, 'eventgen-server.log')
@@ -256,9 +256,9 @@ def _setup_loggers(self, args=None, config=None):
             file_handler.setFormatter(detailed_formatter)
             file_handler.setLevel(logging.DEBUG)
 
-            eventgen_listener_file_handler = logging.handlers.RotatingFileHandler(eventgen_listener_logger_path, maxBytes=2500000, backupCount=20)
-            eventgen_listener_file_handler.setFormatter(detailed_formatter)
-            eventgen_listener_file_handler.setLevel(logging.DEBUG)
+            eventgen_controller_file_handler = logging.handlers.RotatingFileHandler(eventgen_controller_logger_path, maxBytes=2500000, backupCount=20)
+            eventgen_controller_file_handler.setFormatter(detailed_formatter)
+            eventgen_controller_file_handler.setLevel(logging.DEBUG)
 
             error_file_handler = logging.handlers.RotatingFileHandler(eventgen_error_logger_path, maxBytes=2500000, backupCount=20)
             error_file_handler.setFormatter(detailed_formatter)
@@ -274,7 +274,7 @@ def _setup_loggers(self, args=None, config=None):
 
             # Configure eventgen logger
             logger = logging.getLogger('eventgen')
-            logger.setLevel(self.args.VERBOSITY or logging.ERROR)
+            logger.setLevel(self.args.verbosity or logging.ERROR)
             logger.propagate = False
             logger.handlers = []
             if args and not args.modinput_mode:
@@ -283,12 +283,13 @@ def _setup_loggers(self, args=None, config=None):
             logger.addHandler(error_file_handler)
 
             # Configure eventgen listener
-            logger = logging.getLogger('eventgen_listener')
-            logger.setLevel(self.args.VERBOSITY or logging.ERROR)
+            logger = logging.getLogger('eventgen_controller')
+            logger.setLevel(self.args.verbosity or logging.ERROR)
             logger.propagate = False
             logger.handlers = []
-            logger.addHandler(eventgen_listener_file_handler)
+            logger.addHandler(eventgen_controller_file_handler)
             logger.addHandler(error_file_handler)
+            logger.addHandler(console_handler)
 
             # Configure eventgen mertics logger
             logger = logging.getLogger('eventgen_metrics')
@@ -303,6 +304,7 @@ def _setup_loggers(self, args=None, config=None):
             logger.propagate = False
             logger.handlers = []
             logger.addHandler(server_file_handler)
+            logger.addHandler(console_handler)
         else:
             self.logger_config = config
             logging.config.dictConfig(self.logger_config)

splunk_eventgen/eventgen_nameko_controller.py

@@ -456,7 +456,7 @@ def receive_conf(self, data):
             self.server_confs[data['server_name']] = data['server_conf']
 
     def receive_volume(self, data):
-        if data['server_name'] and data["total_volume"]:
+        if data['server_name'] and "total_volume" in data:
             self.server_volumes[data['server_name']] = data['total_volume']
 
     def process_server_status(self, current_time):

splunk_eventgen/eventgen_nameko_dependency.py

@@ -33,7 +33,7 @@ def create_args():
     args.sample = None
     args.version = False
     args.subcommand = 'generate'
-    args.verbosity = 0
+    args.verbosity = 40
     args.wsgi = True
     args.modinput_mode = False
     return args

splunk_eventgen/eventgen_nameko_server.py

@@ -165,7 +165,7 @@ def start(self):
                 return "There is not config file known to eventgen. Pass in the config file to /conf before you start."
             if self.eventgen_dependency.eventgen.check_running():
                 return "Eventgen already started."
-            self.eventgen_dependency.eventgen.start(join_after_start=True)
+            self.eventgen_dependency.eventgen.start(join_after_start=False)
             return "Eventgen has successfully started."
         except Exception as e:
             self.log.exception(e)
@@ -418,7 +418,9 @@ def get_volume(self):
         try:
             config = json.loads(self.get_conf())
             self.log.info(config)
-            self.total_volume = float(self.get_data_volumes(config))
+            fetched_volume = float(self.get_data_volumes(config))
+            if fetched_volume:
+                self.total_volume = fetched_volume
             self.send_volume_to_controller(total_volume=self.total_volume)
             return str(self.total_volume)
         except Exception as e:
@@ -450,6 +452,8 @@ def set_volume(self, volume):
                     if "perDayVolume" in config[stanza].keys():
                         divided_value = float(config[stanza]["perDayVolume"]) * ratio
                     else:
+                        if not num_stanzas:
+                            num_stanzas = 1
                         divided_value = float(volume) / float(num_stanzas)
                     update_json[stanza] = {"perDayVolume": divided_value}
             output = self.edit_conf(json.dumps(update_json))

tests/large/test_eventgen_orchestration.py

@@ -113,9 +113,15 @@ def test_controller_index(self):
 		assert "You are running Eventgen Controller" in r.content
 
 	def test_controller_status(self):
-		r = requests.get("http://127.0.0.1:{}/status".format(self.controller_eventgen_webport))
-		assert r.status_code == 200
-		output = json.loads(r.content)
+		max_retry = 5
+		current_retry = 1
+		output = {}
+		while not output and current_retry <= max_retry:
+			response = requests.get("http://127.0.0.1:{}/status".format(self.controller_eventgen_webport), timeout=10)
+			if response.status_code == 200:
+				output = json.loads(response.content)
+			current_retry += 1
+			time.sleep(10)
 		assert output
 
 	def test_controller_start(self):
@@ -164,10 +170,16 @@ def test_controller_bundle_with_url_and_target(self):
 		assert "Bundle event dispatched to {} with url http://server.com/bundle.tgz".format(TestEventgenOrchestration.server_id[:12]) in r.content
 
 	def test_controller_get_volume(self):
-		r = requests.get("http://127.0.0.1:{}/volume".format(self.controller_eventgen_webport))
-		assert r.status_code == 200
-		output = json.loads(r.content)
-		assert output[TestEventgenOrchestration.server_id[:12]] == {}
+		max_retry = 5
+		current_retry = 1
+		output = {}
+		while not output and current_retry <= max_retry:
+			response = requests.get("http://127.0.0.1:{}/volume".format(self.controller_eventgen_webport), timeout=10)
+			if response.status_code == 200:
+				output = json.loads(response.content)
+			current_retry += 1
+			time.sleep(10)
+		assert output[TestEventgenOrchestration.server_id[:12]] == 0.0
 
 	def test_controller_set_volume_invalid_request(self):
 		r = requests.post("http://127.0.0.1:{}/volume".format(self.controller_eventgen_webport))
@@ -225,7 +237,7 @@ def test_server_get_and_set_conf(self):
 		assert json.loads(r.content) == config_json
 
 	def test_server_start(self):
-		r = requests.post("http://127.0.0.1:{}/start".format(self.server_eventgen_webport))
+		r = requests.post("http://127.0.0.1:{}/start".format(self.server_eventgen_webport), timeout=5)
 		assert r.status_code == 200
 		assert json.loads(r.content) == "Eventgen has successfully started."