opswalrus 1.0.50 → 1.0.52

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 20cc50a607aa6aec146b62eb5dbef09a908c5485f8e0d3dbc39cf5bf9a92895e
-  data.tar.gz: b27cdf6497c28f6ced9be489365003bad03ddb02e6c1285e76c45e6a5ee5d52b
+  metadata.gz: b1ce678751d6d62f4a9b5e40eb6127c22e2e664c6641023ce8df4135609fb73e
+  data.tar.gz: a2747abc2711e77a47371f7c16d1b5104d70b10419b09cd3e992e892cea2d6ca
 SHA512:
-  metadata.gz: ec22d55f8417db680b98d0651855fd83589f0b2428c26be7279f7a2b62582120f4eafdb473b4df9004f98934508cf46f9686a1a28fe8c2adf83eadc82b2a0a38
-  data.tar.gz: 7eb26d1957c2c8115ccaa06b497418f635a4876279c7a4ee5e16eea10546d80303af209a585d4b69ad02f15cca5ce0ea468af86e974947c6283a7998bd8e6426
+  metadata.gz: 5ec4e2b6a547e394b0290a47dafa7cc13960a9c21cef7e1a7edc4d20900cd304a1e0c828025df68f8e7e2e6ce22e3f48882fe44efcaaf1a25e3c74d357981071
+  data.tar.gz: 386afc9a49856131615ff5c5e0c54a1934bf8458d3a77f7f2c6e1da6479343c54a0be8436f8a08beec4e89d6f1b9019e463bc96a5c169f639a7061838f8f240f

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    opswalrus (1.0.50)
+    opswalrus (1.0.52)
       bcrypt_pbkdf (~> 1.1)
       binding_of_caller (~> 1.0)
       citrus (~> 3.0)

data/lib/opswalrus/_reboot.ops

@@ -0,0 +1,64 @@
+params:
+  delay: integer?     # default: 1 - 1 second delay before reboot
+  sync: boolean?      # default: true - wait for the remote host to become available again before returning success/failure
+  timeout: integer?   # default: 300 - 300 seconds (5 minutes)
+...
+
+delay = params.delay.integer!(default: 1)
+sync = params.sync.boolean!(default: true)
+timeout = params.timeout.integer!(default: 300)
+
+delay = 1 if delay < 1
+
+ssh_noprep in: :sequence do
+# ssh_noprep do
+
+  # survey of command options:
+  # sudo reboot
+  # sudo systemctl reboot
+
+  # desc "Rebooting #{to_s} (alias=#{self.alias})"
+  # reboot_success = sh? 'sudo /bin/sh -c "(sleep {{ delay }} && reboot) &"'.mustache
+  # puts reboot_success
+
+  # reconnect_time = nil
+  # reconnect_success = if sync
+  #   desc "Waiting for #{to_s} (alias=#{self.alias}) to finish rebooting"
+  #   initial_reconnect_delay = delay + 10
+  #   sleep initial_reconnect_delay
+
+  #   reconnected = false
+  #   give_up = false
+  #   t1 = Time.now
+  #   until reconnected || give_up
+  #     begin
+  #       reconnected = sh?('true')
+  #       # while trying to reconnect, we expect the following exceptions:
+  #       # 1. Net::SSH::Disconnect < Net::SSH::Exception with message: "connection closed by remote host"
+  #       # 2. Errno::ECONNRESET < SystemCallError with message: "Connection reset by peer"
+  #     rescue Net::SSH::Disconnect, Errno::ECONNRESET => e
+  #       # noop; we expect these while we're trying to reconnect
+  #     rescue => e
+  #       puts "#{e.class} < #{e.class.superclass}"
+  #       puts e.message
+  #       puts e.backtrace.take(5).join("\n")
+  #     end
+
+  #     wait_time_elapsed_in_seconds = Time.now - t1
+  #     give_up = wait_time_elapsed_in_seconds > timeout
+  #     sleep 5
+  #   end
+  #   reconnect_time = initial_reconnect_delay + (Time.now - t1)
+  #   reconnected
+  # else
+  #   false
+  # end
+
+  # {
+  #   success: reboot_success && (sync == reconnect_success),
+  #   rebooted: reboot_success,
+  #   reconnected: reconnect_success,
+  #   reboot_duration: reconnect_time
+  # }
+  reboot(delay: delay, sync: sync, timeout: timeout)
+end

data/lib/opswalrus/app.rb

@@ -243,6 +243,26 @@ module OpsWalrus
       1
     end
 
+    def reboot()
+      set_pwd(__FILE__.to_pathname.dirname)
+      shell_ops_file = OpsFile.new(self, __FILE__.to_pathname.dirname.join("_reboot.ops"))
+      op = OperationRunner.new(self, shell_ops_file)
+      result = op.run([], params_json_hash: @params)
+      puts "result class=#{result.class}"
+      exit_status = result.exit_status
+      stdout = JSON.pretty_generate(result.value)
+      output = if exit_status == 0
+        Style.green(stdout)
+      else
+        Style.red(stdout)
+      end
+      puts output
+      exit_status
+    rescue Error => e
+      puts "Error: #{e.message}"
+      1
+    end
+
     # args is of the form ["github.com/davidkellis/my-package/sub-package1", "operation1", "arg1:val1", "arg2:val2", "arg3:val3"]
     # if the first argument is the path to a .ops file, then treat it as a local path, and add the containing package
     #   to the load path

data/lib/opswalrus/cli.rb

@@ -189,6 +189,37 @@ module OpsWalrus
       end
     end
 
+    desc "Reboot one or more remote hosts"
+    long_desc 'Reboot one or more remote hosts'
+    command :reboot do |c|
+      # dry run
+      c.switch :noop, desc: "Perform a dry run"
+      c.switch :dryrun, desc: "Perform a dry run"
+      c.switch :dry_run, desc: "Perform a dry run"
+
+      c.action do |global_options, options, args|
+        $app.set_log_level(global_options[:trace] && :trace || global_options[:debug] && :debug || global_options[:verbose] && :info || :warn)
+
+        hosts = global_options[:hosts]
+        $app.set_inventory_hosts(hosts)
+
+        tags = global_options[:tags]
+        $app.set_inventory_tags(tags)
+
+        id_files = global_options[:id]
+        id_files = OpsWalrus.env_specified_age_ids if id_files.empty?
+
+        $app.set_identity_files(id_files)
+
+        dry_run = [:noop, :dryrun, :dry_run].any? {|sym| global_options[sym] || options[sym] }
+        $app.dry_run! if dry_run
+
+        exit_status = $app.reboot()
+
+        exit_now!("error", exit_status) unless exit_status == 0
+      end
+    end
+
     desc 'Run an operation from a package'
     long_desc 'Run the specified operation found within the specified package'
     arg 'args', :multiple

data/lib/opswalrus/host.rb

@@ -127,11 +127,11 @@ module OpsWalrus
       retval = instance_exec(local_host, &block)    # local_host is passed as the argument to the block
 
       # todo: cleanup
-      # if tmp_bundle_root_dir =~ /tmp/   # sanity check the temp path before we blow away something we don't intend
-      #   @_host.execute(:rm, "-rf", "tmpops.zip", tmp_bundle_root_dir)
-      # else
-      #   @_host.execute(:rm, "-rf", "tmpops.zip")
-      # end
+      if tmp_bundle_root_dir =~ /tmp/   # sanity check the temp path before we blow away something we don't intend
+        @_host.execute(:rm, "-rf", "tmpops.zip", tmp_bundle_root_dir)
+      else
+        @_host.execute(:rm, "-rf", "tmpops.zip")
+      end
 
       retval
     end
@@ -143,6 +143,57 @@ module OpsWalrus
 
 
   module HostDSL
+    # delay: integer?     # default: 1 - 1 second delay before reboot
+    # sync: boolean?      # default: true - wait for the remote host to become available again before returning success/failure
+    # timeout: integer?   # default: 300 - 300 seconds (5 minutes)
+    def reboot(delay: 1, sync: true, timeout: 300)
+      delay = 1 if delay < 1
+
+      desc "Rebooting #{to_s} (alias=#{self.alias})"
+      reboot_success = sh? 'sudo /bin/sh -c "(sleep {{ delay }} && reboot) &"'.mustache
+      puts reboot_success
+
+      reconnect_time = nil
+      reconnect_success = if sync
+        desc "Waiting for #{to_s} (alias=#{self.alias}) to finish rebooting"
+        initial_reconnect_delay = delay + 10
+        sleep initial_reconnect_delay
+
+        reconnected = false
+        give_up = false
+        t1 = Time.now
+        until reconnected || give_up
+          begin
+            reconnected = sh?('true')
+            # while trying to reconnect, we expect the following exceptions:
+            # 1. Net::SSH::Disconnect < Net::SSH::Exception with message: "connection closed by remote host"
+            # 2. Errno::ECONNRESET < SystemCallError with message: "Connection reset by peer"
+          rescue Net::SSH::Disconnect, Errno::ECONNRESET => e
+            # noop; we expect these while we're trying to reconnect
+          rescue => e
+            puts "#{e.class} < #{e.class.superclass}"
+            puts e.message
+            puts e.backtrace.take(5).join("\n")
+          end
+
+          wait_time_elapsed_in_seconds = Time.now - t1
+          give_up = wait_time_elapsed_in_seconds > timeout
+          sleep 5
+        end
+        reconnect_time = initial_reconnect_delay + (Time.now - t1)
+        reconnected
+      else
+        false
+      end
+
+      {
+        success: reboot_success && (sync == reconnect_success),
+        rebooted: reboot_success,
+        reconnected: reconnect_success,
+        reboot_duration: reconnect_time
+      }
+    end
+
     # runs the given command
     # returns the stdout from the command
     def sh(desc_or_cmd = nil, cmd = nil, input: nil, &block)
@@ -179,7 +230,7 @@ module OpsWalrus
         else
           offset = 3    # 3, because 1 references the stack frame corresponding to the caller of WalrusLang.eval,
                         # 2 references the stack frame corresponding to the caller of shell!,
-                        # and 3 references the stack frame corresponding to teh caller of either sh/sh?/shell
+                        # and 3 references the stack frame corresponding to the caller of either sh/sh?/shell
           WalrusLang.eval(cmd, offset)
         end
       else

data/lib/opswalrus/invocation.rb

@@ -138,9 +138,9 @@ module OpsWalrus
           File.unlink(json_kwargs_tempfile) rescue nil
         end
         # todo: make sure this cleanup is present
-        # if remote_json_kwargs_tempfile_basename
-        #   @host_proxy.execute(:rm, "-f", remote_json_kwargs_tempfile_basename)
-        # end
+        if remote_json_kwargs_tempfile_basename
+          @host_proxy.execute(:rm, "-f", remote_json_kwargs_tempfile_basename)
+        end
       end
     end
   end

data/lib/opswalrus/ops_file_script_dsl.rb

@@ -55,6 +55,9 @@ module OpsWalrus
       sshkit_hosts = hosts.map(&:sshkit_host)
       sshkit_host_to_ops_host_map = sshkit_hosts.zip(hosts).to_h
       ops_file_script = local_host = self
+
+      results_lock = Thread::Mutex.new
+      results = {}
       # on sshkit_hosts do |sshkit_host|
       SSHKit::Coordinator.new(sshkit_hosts).each(in: kwargs[:in] || :parallel) do |sshkit_host|
         # in this context, self is an instance of one of the subclasses of SSHKit::Backend::Abstract, e.g. SSHKit::Backend::Netssh
@@ -73,6 +76,10 @@ module OpsWalrus
             # we run the block in the context of the host proxy object, s.t. `self` within the block evaluates to the host proxy object
             retval = host.instance_exec(local_host, &block)    # local_host is passed as the argument to the block
 
+            results_lock.synchronize do
+              results[host] = retval
+            end
+
             retval
           rescue SSHKit::Command::Failed => e
             App.instance.error "[!] Command failed:"
@@ -102,6 +109,7 @@ module OpsWalrus
           end
         end # runtime_env.handle_input
       end # SSHKit::Coordinator
+      results
     end # def ssh
 
     def ssh(*args, **kwargs, &block)
@@ -111,6 +119,9 @@ module OpsWalrus
       sshkit_hosts = hosts.map(&:sshkit_host)
       sshkit_host_to_ops_host_map = sshkit_hosts.zip(hosts).to_h
       ops_file_script = local_host = self
+
+      results_lock = Thread::Mutex.new
+      results = {}
       # bootstrap_shell_script = BootstrapLinuxHostShellScript
       # on sshkit_hosts do |sshkit_host|
       SSHKit::Coordinator.new(sshkit_hosts).each(in: kwargs[:in] || :parallel) do |sshkit_host|
@@ -134,6 +145,10 @@ module OpsWalrus
               puts "Failed to bootstrap #{host}. Unable to run operation."
             end
 
+            results_lock.synchronize do
+              results[host] = retval
+            end
+
             retval
           rescue SSHKit::Command::Failed => e
             App.instance.error "[!] Command failed:"
@@ -163,6 +178,7 @@ module OpsWalrus
           end
         end # runtime_env.handle_input
       end # SSHKit::Coordinator
+      results
     end # def ssh
 
     def current_dir
@@ -261,7 +277,7 @@ module OpsWalrus
         else
           offset = 3    # 3, because 1 references the stack frame corresponding to the caller of WalrusLang.eval,
                         # 2 references the stack frame corresponding to the caller of shell!,
-                        # and 3 references the stack frame corresponding to teh caller of either sh/sh?/shell
+                        # and 3 references the stack frame corresponding to the caller of either sh/sh?/shell
           WalrusLang.eval(cmd, offset)
         end
       else

data/lib/opswalrus/version.rb

@@ -1,3 +1,3 @@
 module OpsWalrus
-  VERSION = "1.0.50"
+  VERSION = "1.0.52"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: opswalrus
 version: !ruby/object:Gem::Version
-  version: 1.0.50
+  version: 1.0.52
 platform: ruby
 authors:
 - David Ellis
@@ -185,6 +185,7 @@ files:
 - exe/ops
 - lib/opswalrus.rb
 - lib/opswalrus/_bootstrap.ops
+- lib/opswalrus/_reboot.ops
 - lib/opswalrus/_shell.ops
 - lib/opswalrus/app.rb
 - lib/opswalrus/bootstrap.sh