smart_proxy_discovery_image 1.0.6 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 9e9e8345ac2b1139379f5afc7d0b617258afc2e2
-  data.tar.gz: fbf8485197642a9fb8e0ed9b36ecdfdc04bcc4e2
+SHA256:
+  metadata.gz: e5fc93e913ac9a70a9d099a12e4a7eba8139777de210569b44fb8e305e74299c
+  data.tar.gz: b41a1f2e085f2f7a04a33a88a6f670581d1d89ae34b6a59a497b135f12ad76ea
 SHA512:
-  metadata.gz: ac98ab2e5b4cbf3d1dcea1c763e84d799d2860c46cf99a1d20e5d7560d493570fa302fda5ca6c1b5bbd0b029703fa704f5606bc496fdbc8c5d6389a2ba68a341
-  data.tar.gz: 2f6a15bccbf3533af192e2571495cd36adbb891491d81f612e4efc99918856e5db1c15c707b4b4e7c58da279f435944fafdde9004a2f1af8ff8130854e4858c3
+  metadata.gz: e79b8fc34a0f3e04a99fd5f380bb9aa55699fe9d9db0b61e093173e41aa98e0340a8bc99a981b799ae669b5aec8fed82283d6c00ebd5000ced63c026cf6af94d
+  data.tar.gz: 6c2a81f40a1f6285a3e928cea8340a7c3ad633bd3cca2f87c1352b76f1c4599c49f94b15b5f6b8fbd4e66349c24dc9ceeba27bbfdb17d8bd85f8aa6c98f63de3

data/lib/smart_proxy_discovery_image/power_api.rb

@@ -7,25 +7,24 @@ module Proxy::DiscoveryImage
     include Proxy::Util
 
     put "/reboot" do
-      log_halt 500, "shutdown binary was not found" unless (shutdown = which('shutdown'))
+      log_halt(500, "shutdown binary was not found") unless (shutdown = which('shutdown'))
       run_after_response 5, shutdown, "-r", "now", "Foreman Power API reboot"
       content_type :json
       { :result => true }.to_json
     end
 
     put "/kexec" do
-      log_halt 500, "kexec binary was not found" unless (kexec = which('kexec'))
-      data = JSON.parse request.body.read
-
-      logger.debug "Downloading: #{data['kernel']}"
-      if ::Proxy::HttpDownload.new(data['kernel'], '/tmp/vmlinuz').start.join != 0
-        log_halt 500, "cannot download kernel for kexec!"
-      end
-      logger.debug "Downloading: #{data['initram']}"
-      if ::Proxy::HttpDownload.new(data['initram'], '/tmp/initrd.img').start.join != 0
-        log_halt 500, "cannot download initram for kexec!"
+      body_data = request.body.read
+      # change virtual terminal out of newt screen
+      system("chvt", "2")
+      logger.debug "Initiated kexec provisioning with #{body_data}"
+      log_halt(500, "kexec binary was not found") unless (kexec = which('kexec'))
+      begin
+        data = JSON.parse body_data
+      rescue JSON::ParserError
+        log_halt 500, "Unable to parse kexec JSON input: #{body_data}"
       end
-      run_after_response 2, kexec, "--force", "--reset-vga", "--append=#{data['append']}", "--initrd=/tmp/initrd.img", "/tmp/vmlinuz", *data['extra']
+      download_and_run_after_response data, 2, kexec, "--debug", "--force", "--append=#{data['append']}", "--initrd=/tmp/initrd.img", "/tmp/vmlinuz", *data['extra']
       { :result => true }.to_json
     end
 
@@ -33,9 +32,9 @@ module Proxy::DiscoveryImage
     # Execute command in a separate thread after 5 seconds to give the server some
     # time to finish the request. Does *not* execute via a shell.
     def run_after_response(seconds, *command)
-      logger.debug "Power API command scheduled in #{seconds} seconds"
       Thread.start do
         begin
+          logger.debug "Power API scheduling in #{seconds} seconds: #{command.inspect}"
           sleep seconds
           logger.debug "Power API executing: #{command.inspect}"
           if (sudo = which('sudo'))
@@ -50,5 +49,32 @@ module Proxy::DiscoveryImage
         end
       end
     end
+
+    # Variant which also downloads kernel and initramdisk
+    def download_and_run_after_response(data, seconds, *command)
+      Thread.start do
+        begin
+          # download kernel and initramdisk
+          downloaded = download_file(data, 'kernel', 'vmlinuz', '/tmp') &&
+                         download_file(data, 'initram', 'initrd.img', '/tmp')
+          # wait few seconds just in case the download was fast and perform kexec
+          # only perform kexec when both locks were available to prevent subsequent request while downloading
+          run_after_response(seconds, *command) if downloaded
+        rescue Exception => e
+          logger.error "Error during command execution: #{e}"
+        end
+      end
+    end
+
+    def download_file(data, kind, name, prefix)
+      return unless data && (url = data[kind])
+
+      logger.debug "Downloading: #{url}"
+      download_thread = ::Proxy::HttpDownload.new(url, File.join(prefix, name)).start
+      logger.error("#{name} is still downloading, ignored") unless download_thread
+      download_success = download_thread.join.zero?
+      logger.error("cannot download #{name} for kexec") unless download_success
+      download_success
+    end
   end
 end

data/lib/smart_proxy_discovery_image/version.rb

@@ -1,5 +1,5 @@
 module Proxy
   module DiscoveryImage
-    VERSION = '1.0.6'
+    VERSION = '1.2.1'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smart_proxy_discovery_image
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.2.1
 platform: ruby
 authors:
 - Lukas Zapletal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-24 00:00:00.000000000 Z
+date: 2020-08-06 00:00:00.000000000 Z
 dependencies: []
 description: |2
       Smart Proxy plugin providing Image API on discovered nodes. This plugin is only
@@ -30,9 +30,9 @@ files:
 - lib/smart_proxy_discovery_image/power_api.rb
 - lib/smart_proxy_discovery_image/version.rb
 - settings.d/discovery_image.yml.example
-homepage: http://github.com/theforeman/smart_proxy_discovery_image
+homepage: https://github.com/theforeman/smart_proxy_discovery_image
 licenses:
-- GPLv3
+- GPL-3.0
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -49,8 +49,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: FDI API for Foreman Smart-Proxy