Adding logs and redirect python output to console

Author: Himani Anil Deshpande

cookbooks/aws-parallelcluster-slurm/files/default/head_node_slurm/slurm/pcluster_fleet_config_generator.py

@@ -211,17 +211,13 @@ def get_total_min_count(input_file: str):
         else:
             message = f"Error parsing configuration file. {e}. {traceback.format_exc()}."
         message += f" Queue: {queue_name}" if queue_name else ""
-        log.error(message)
+        print(message)
         raise CriticalError(message)
     return total_min_count
 
 
 def main():
     try:
-        logging.basicConfig(
-            level=logging.INFO, format="%(asctime)s - [%(name)s:%(funcName)s] - %(levelname)s - %(message)s"
-        )
-        log.info("Running ParallelCluster Fleet Config Generator")
         parser = argparse.ArgumentParser(description="Take in fleet configuration generator related parameters")
         parser.add_argument(
             "--input-file",
@@ -233,8 +229,12 @@ def main():
         exclusive_group.add_argument("--total-min-count", help="Gets the total min count of Scheduler", action='store_true')
         args = parser.parse_args()
         if args.total_min_count:
-            log.info(f"The total MinCount of cluster is {get_total_min_count(args.input_file)}")
+            print(f"The total MinCount of cluster is {get_total_min_count(args.input_file)}")
         else:
+            logging.basicConfig(
+                level=logging.INFO, format="%(asctime)s - [%(name)s:%(funcName)s] - %(levelname)s - %(message)s"
+            )
+            log.info("Running ParallelCluster Fleet Config Generator")
             generate_fleet_config_file(args.output_file, args.input_file)
     except Exception as e:
         log.exception("Failed to generate Fleet configuration, exception: %s", e)

cookbooks/aws-parallelcluster-slurm/libraries/helpers.rb

@@ -179,7 +179,7 @@ def wait_cluster_ready
 end
 
 def get_static_node_count
-  cmd = Mixlib::ShellOut.new("#{cookbook_virtualenv_path}/bin/python #{node['cluster']['scripts_dir']}/slurm/pcluster_fleet_config_generator.py  --input-file #{node['cluster']['cluster_config_path']} --total-min-count | grep -o 'The total MinCount of cluster is =\([0-9]*\)' | cut -d'=' -f2")
+  cmd = Mixlib::ShellOut.new("#{cookbook_virtualenv_path}/bin/python #{node['cluster']['scripts_dir']}/slurm/pcluster_fleet_config_generator.py  --input-file #{node['cluster']['cluster_config_path']} --total-min-count | grep -o 'The total MinCount of cluster is \([0-9]*\)' | cut -d' ' -f7")
   cmd.run_command.stdout.strip
 end
 
@@ -208,7 +208,7 @@ def check_for_protected_mode(fleet_status_command) # rubocop:disable Lint/Nested
       fleet_status_command = Shellwords.escape(
         "/usr/local/bin/get-compute-fleet-status.sh"
       )
-
+      Chef::Log.info("TEST LOG #{get_static_node_count}")
       # Example output for sinfo
       # sinfo -h -o '%N %t'
       # queue-0-dy-compute-resource-g4dn-0-[1-10],queue-1-dy-compute-resource-g4dn-1-[1-10] idle~