Revert "Add archive (#287)"

This reverts commit b919440.
argonne-lcf · Oct 1, 2024 · 4c0d386 · 4c0d386
1 parent 85b6b11
commit 4c0d386
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 86 deletions.
diff --git a/.github/workflows/presubmit.yml b/.github/workflows/presubmit.yml
@@ -159,7 +159,7 @@ jobs:
         run: tar -xvf thapi.tar
       - run: sudo apt update; sudo apt install -y lttng-tools liblttng-ust-dev ruby ruby-dev libprotobuf-dev libpocl2 clinfo bats coreutils libglib2.0-dev
       - run: sudo gem install babeltrace2 opencl_ruby_ffi
-      - name: Load Efficios Dependencies
+      - name: Load Babeltrace2
         run: |
           echo "$HOME/babeltrace2/2.0.5/bin" >> $GITHUB_PATH
           echo "LD_LIBRARY_PATH=$HOME/babeltrace2/2.0.5/lib:$LD_LIBRARY_PATH" >> $GITHUB_ENV
@@ -183,7 +183,7 @@ jobs:
           key: ${{ runner.os }}-build-${{ env.cache-name }}
       - run: sudo apt update; sudo apt install -y gcc g++ lttng-tools liblttng-ust-dev ruby ruby-dev elfutils libelf-dev libdw-dev libprotobuf-dev protobuf-compiler valgrind libglib2.0-dev
       - run: sudo gem install cast-to-yaml nokogiri babeltrace2 opencl_ruby_ffi metababel
-      - name: Load Efficios Dependencies
+      - name: Load Babeltrace2
         run: |
           echo "$HOME/babeltrace2/2.0.5/bin" >> $GITHUB_PATH
           echo "PKG_CONFIG_PATH=$HOME/babeltrace2/2.0.5/lib/pkgconfig:$PKG_CONFIG_PATH" >> $GITHUB_ENV
@@ -221,7 +221,7 @@ jobs:
           key: ${{ runner.os }}-build-${{ env.cache-name }}
       - run: sudo apt update; sudo apt install -y gcc g++ lttng-tools liblttng-ust-dev ruby ruby-dev elfutils libelf-dev libdw-dev libprotobuf-dev protobuf-compiler valgrind libglib2.0-dev
       - run: sudo gem install cast-to-yaml nokogiri babeltrace2 opencl_ruby_ffi metababel
-      - name: Load Efficios Dependencies
+      - name: Load Babeltrace2
         run: |
           echo "$HOME/babeltrace2/2.0.5/bin" >> $GITHUB_PATH
           echo "PKG_CONFIG_PATH=$HOME/babeltrace2/2.0.5/lib/pkgconfig:$PKG_CONFIG_PATH" >> $GITHUB_ENV
@@ -253,7 +253,7 @@ jobs:
           key: ${{ runner.os }}-build-${{ env.cache-name }}
       - run: sudo apt update; sudo apt install -y gcc g++ lttng-tools liblttng-ust-dev ruby ruby-dev elfutils libelf-dev libdw-dev libprotobuf-dev protobuf-compiler valgrind libglib2.0-dev
       - run: sudo gem install cast-to-yaml nokogiri babeltrace2 opencl_ruby_ffi metababel
-      - name: Load Efficios Dependencie
+      - name: Load Babeltrace2
         run: |
           echo "$HOME/babeltrace2/2.0.5/bin" >> $GITHUB_PATH
           echo "PKG_CONFIG_PATH=$HOME/babeltrace2/2.0.5/lib/pkgconfig:$PKG_CONFIG_PATH" >> $GITHUB_ENV

diff --git a/integration_tests/general.bats b/integration_tests/general.bats
@@ -22,10 +22,6 @@ teardown_file() {
    rm out.pftrace
 }
 
-@test "archive_summary" {
-   $IPROF --archive $THAPI_TEST_BIN
-}
-
 @test "replay_summary" {
    $IPROF $THAPI_TEST_BIN
    $IPROF -r

diff --git a/utils/babeltrace_thapi.in b/utils/babeltrace_thapi.in
@@ -130,7 +130,6 @@ def get_components(names)
   components_classes = {
     'source.ctf.fs' => BT2::BTPlugin.find('ctf').get_source_component_class_by_name('fs'),
     'source.ctf.lttng_live' => BT2::BTPlugin.find('ctf').get_source_component_class_by_name('lttng-live'),
-    'source.ctf.lttng_archive' => BT2::BTPlugin.find('ctf').get_source_component_class_by_name('lttng-archive'),
     'filter.utils.muxer' => BT2::BTPlugin.find('utils').get_filter_component_class_by_name('muxer'),
     'sink.text.pretty' => BT2::BTPlugin.find('text').get_sink_component_class_by_name('pretty'),
     'sink.ctf.fs' => BT2::BTPlugin.find('ctf').get_sink_component_class_by_name('fs'),
@@ -201,10 +200,6 @@ def get_and_add_components(graph, names, l_inputs)
       graph.add(comp, 'source_live',
                 params: { 'inputs' => $options[:inputs],
                           'session-not-found-action' => 'end' })
-    when 'source.ctf.lttng_archive'
-      graph.add(comp, 'source_archive',
-                params: { 'session-name' => $options[:archive],
-                          'session-found-file-path' => $options[:'archive-session-found-file-path'] })
     when 'source.ctf.fs'
       s = Find.find(*l_inputs)
               .reject { |path| FileTest.directory?(path) }
@@ -286,8 +281,6 @@ def bt_graphs(inputs)
   @bt_graphs[inputs] ||= begin
     g_comps = [if $options[:live]
                  'source.ctf.lttng_live'
-               elsif $options[:archive]
-                  'source.ctf.lttng_archive'
                else
                  'source.ctf.fs'
                end]
@@ -361,8 +354,6 @@ class BabeltraceParserThapi < OptionParserWithDefaultAndValidation
        'Format: backend_name[:backend_level],...',
         default: ['mpi:3', 'omp:2', 'cl:1', 'ze:1', 'cuda:1', 'hip:1'])
     on('--debug', default: false)
-    on('--archive SESSION-NAME')
-    on('--archive-session-found-file-path PATH')
     on('--[no-]muxer')
     on('-v', '--version', 'Print the version string') do
       puts File.read(File.join(DATADIR, 'version'))

diff --git a/xprof/xprof.rb.in b/xprof/xprof.rb.in
@@ -13,11 +13,6 @@ PREFIX = '@prefix@'
 DATAROOTDIR = File.join(PREFIX, 'share')
 DATADIR = DATAROOTDIR
 
-LTTNG_ARCHIVE_SIZE = '50M'
-LTTNG_ARCHIVE_TIMER = '60s'
-LTTNG_DIRWATCH_SIZE = '500' # In MiB
-LTTNG_DIRWATCH_LOCK_RETRY_DELAY = 0.1
-
 $LOAD_PATH.unshift(DATADIR) if File.directory?(DATADIR)
 require 'open3'
 require 'fileutils'
@@ -316,7 +311,6 @@ class Sync_daemon
     raise
   ensure
     return unless f
-
     f.global_barrier
     f.finalize
   end
@@ -575,24 +569,16 @@ def lm_setup_lttng(backends)
     end
 
   end
-  # This is required to force the creation of an trace,
-  # so that dirwatch doesn't complain about empty trace
-  if OPTIONS[:archive]
-    exec("lttng enable-rotation --session=#{lttng_session_uuid} --size=#{LTTNG_ARCHIVE_SIZE} --timer=#{LTTNG_ARCHIVE_TIMER}")
-  end
   exec("lttng start #{lttng_session_uuid}")
 end
 
 def lm_lttng_teardown_session
   raise unless mpi_local_master?
-
-  exec("lttng rotate #{lttng_session_uuid}") if OPTIONS[:archive]
   exec("lttng destroy #{lttng_session_uuid}")
 end
 
 def lm_lttng_kill_sessiond
   raise unless mpi_local_master?
-
   # Need to kill the sessiond Daemon. It's safe because each job has their own
   #
   # In theory, opening the lttng-sessiond.pid file is racy.
@@ -619,35 +605,15 @@ def lm_babeltrace(backends)
   opts << "--output #{thapi_trace_dir_tmp}"
   opts << "--backends #{backends.join(',')}"
   opts << '--no-discard-metadata' if type == 'aggreg' && OPTIONS.include?(:'kernel-verbose')
-
-  if OPTIONS[:archive]
-    read_file = File.join(lttng_trace_dir_tmp, 'bt_archive_ready')
-    opts << "--archive #{lttng_session_uuid} --archive-session-found-file-path=#{read_file}"
-    cmd = "#{BINDIR}/babeltrace_thapi #{opts.join(' ')} -- #{lttng_trace_dir_tmp}"
-    LOGGER.debug(cmd)
-    pid_bt = spawn(cmd)
-
-    cmd = "dirwatch.py --log-level=CRITICAL #{lttng_session_uuid} #{LTTNG_DIRWATCH_SIZE}"
-    LOGGER.debug(cmd)
-    pid_dirwatch = spawn(cmd)
-
-    until File.exist?(read_file)
-      # Ensure that dirwatch.py didn't crash, and deadlock
-      Process.wait(pid_dirwatch, Process::WNOHANG)
-      sleep(LTTNG_DIRWATCH_LOCK_RETRY_DELAY)
-    end
-    [pid_bt, pid_dirwatch]
-  else
-    exec("#{BINDIR}/babeltrace_thapi #{opts.join(' ')} -- #{lttng_trace_dir_tmp}")
-  end
+  exec("#{BINDIR}/babeltrace_thapi #{opts.join(' ')} -- #{lttng_trace_dir_tmp}")
 end
 
 #   _
 #  |_) ._ _   _  _   _  _ o ._   _
 #  |   | (_) (_ (/_ _> _> | | | (_|
 #                                _|
 
-# Some naming convention
+# Some naming convension
 # lm == function executed only local_master
 # gm ==  function executed only global_master
 
@@ -657,11 +623,6 @@ def lm_move_to_shared
   if OPTIONS.include?(:trace) || !OPTIONS[:analysis]
     # The Apps finished, lttng finished, need to move to the shared tmp folder
     FileUtils.mkdir_p(File.dirname(thapi_trace_dir_tmp))
-    # NOTE: I don't understand `mv`
-    #       File.mv(a, b) will put a into b (aka a/b)
-    #       FileUtils.rename(a,b) will move a as b, but may
-    #         raise Invalid cross-device error.
-    #       So we use `exec(mv -T a b)`, this have the added benefice of logging
     exec("mv #{lttng_trace_dir_tmp} #{thapi_trace_dir_tmp}")
   else
     # `lm_babeltrace` finished, can remove `tmp` folder
@@ -677,7 +638,7 @@ def gm_rename_folder
   # Replace it with a better name, and update the root metadata.
 
   thapi_trace_dir_tmp_root = File.dirname(thapi_trace_dir_tmp)
-  # Because of `traced-rank`, `mpi_master` may not have any trace available,
+  # Because of `traced-rank`, `mpi_master` may not have any trace avalaible,
   # so find the first hostname who have a metadata
   FileUtils.cp(Dir.glob("#{thapi_trace_dir_tmp_root}/*/thapi_metadata.yaml").first,
                File.join(thapi_trace_dir_tmp_root, 'thapi_metadata.yaml'))
@@ -701,45 +662,26 @@ def trace_and_on_node_processing(usr_argv)
     # All ranks need to set the LLTTNG_HOME env
     # so they can have access to the daemon
     ENV['LTTNG_HOME'] = lttng_home_dir
-    LOGGER.debug("LTTNG_HOME = #{ENV.fetch('LTTNG_HOME', nil)}")
-
-    # Only local master spawn daemons (lttng, and babeltrace)
-    #  and the start the lttng-session
-    pids = if mpi_local_master?
-             lm_setup_lttng(backends)
-             lm_babeltrace(backends) if OPTIONS[:archive]
-           end
-    # Other local node cannot start before lttng and the daemon
+    # Only local master spawn LTTNG daemon and start session
+    lm_setup_lttng(backends) if mpi_local_master?
     syncd.local_barrier('waiting_for_lttng_setup')
     # Launch User Command
     launch_usr_bin(h, usr_argv)
-    # We need to ensure that all the local ranks have finished
-    # running the user application
+
+    # We need to be sure that all the local ranks are finished
     # before the local master stops the lttng session
     syncd.local_barrier('waiting_for_application_ending')
-
-    # Everything from now on, is some local-master processing
-    # The `Sync_daemon` context will handle the call to the global barrier
-    # for the early exiting ranks
     return unless mpi_local_master?
 
-    # Stop Lttng session and babeltrace daemons
+    # Stop Lttng session
     lm_lttng_teardown_session
-    if OPTIONS[:archive]
-      LOGGER.debug("Waiting for babeltrace_thapi and dirwatch (#{pids}) to finish")
-      pids.each do |pid|
-        Process.wait(pid)
-        raise "#{pid} failed" unless $?.success?
-      end
-    end
+    # Lttng session is finished,
     # we can kill the session daemon
     lm_lttng_kill_sessiond
     # Preprocess trace
-    lm_babeltrace(backends) unless OPTIONS[:archive]
+    lm_babeltrace(backends)
     lm_move_to_shared
   end
-  # Global master rename the unique trace folder to a more
-  # human friendly name
   gm_rename_folder if mpi_master?
 end
 
@@ -834,7 +776,6 @@ if __FILE__ == $PROGRAM_NAME
   parser.on('-b', '--backends BACKENDS', Array, "Select which and how backends' need to handled.",
             'Format: backend_name[:backend_level],...',
             default: ['mpi:3', 'omp:2', 'cl:1', 'ze:1', 'cuda:1', 'hip:1'])
-  parser.on('--[no-]archive', 'Trigger for ardhive support', default: false)
 
   # Analysis
   parser.on('-r', '--replay [PATH]', 'Replay traces for post-mortem analysis.',