Apply suggestions from code review

Add exception handling in `wait_for_rest_api` to make wait for LS REST API retriable. Remove unnecessary wait for LS process.
elastic · Mar 4, 2025 · 9d0e1c0 · 9d0e1c0
1 parent aea7b15
commit 9d0e1c0
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/qa/integration/services/logstash_service.rb b/qa/integration/services/logstash_service.rb
@@ -221,6 +221,8 @@ def is_port_open?
   def rest_active?
     result = monitoring_api.node_info
     !result.nil?
+  rescue
+    return false
   end
 
   def monitoring_api

diff --git a/qa/integration/specs/logstash_to_logstash_spec.rb b/qa/integration/specs/logstash_to_logstash_spec.rb
@@ -54,7 +54,6 @@ def run_logstash_instance(config_name, options = {}, &block)
                                     "--path.config", config_to_temp_file(@fixture.config(config_name, options)),
                                     "--path.data", get_temp_path_dir,
                                     "--api.http.port", api_port.to_s)
-    logstash_service.wait_for_logstash
     logstash_service.wait_for_rest_api
     yield logstash_service
   ensure