bosh_cli 1.3169.0 → 1.3173.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4d65f21821f357b177b60604495cada9fb19a905
-  data.tar.gz: 99512cfe481d7e21af42ce996f8482ea2bf92a02
+  metadata.gz: fd4840a33d85038708d6c6bcb0a70ef609d8fe84
+  data.tar.gz: 9f528fe9ed3e09e5e697ccfa01876766125defd1
 SHA512:
-  metadata.gz: 79b1646f801c050e15450a7530d137be0cb12500989d52f61eeafc6012914e7067c0158ceaa9997a55b4011ee1ef4ccaa040d05a85dd790d85ef1578ab338c55
-  data.tar.gz: e285d74c20c709d25f43b57cd5f574212fffb629c058a93f1fa2c8ba721929172dd932fc56d4739a4e97c70c0fb943329a045236ffe2b93ac34ec6e53f5a3f1b
+  metadata.gz: 36106183c74c6d0e0ce882b745e78c7189d36fee761986fd70d967c81b88f9d55090904951835c87b9a0ebd436786d1378a5fd1f53bdeb0cd254ef4e08dc0ae4
+  data.tar.gz: f78e770441f282e4ee0726f5697b0a880406cf7877d6a828e0907e4c07a8320f655ca9e4663d571a94e0d3bcb68412197b0c69249f447b749de2fee0eeb2107c

data/lib/cli/client/director.rb

@@ -554,6 +554,34 @@ module Bosh
           path
         end
 
+        def restore_db(filename)
+          upload_without_track('/restore', filename, { content_type: 'application/x-compressed' })
+        end
+
+        def check_director_restart(poll_interval, timeout)
+          current_time = start_time = Time.now()
+
+          #step 1, wait until director is stopped
+          while current_time.to_i - start_time.to_i <= timeout do
+            status, body = get_json_with_status('/info')
+            break if status != 200
+
+            sleep(poll_interval)
+            current_time = Time.now()
+          end
+
+          #step 2, wait until director is started
+          while current_time.to_i - start_time.to_i <= timeout do
+            status, body = get_json_with_status('/info')
+            return true if status == 200
+
+            sleep(poll_interval)
+            current_time = Time.now()
+          end
+
+          return false
+        end
+
         def list_locks
           get_json('/locks')
         end
@@ -602,6 +630,14 @@ module Bosh
           file.stop_progress_bar if file
         end
 
+        def upload_without_track(uri, filename, options = {})
+          file = FileWithProgressBar.open(filename, 'r')
+          status, _ = post(uri, options[:content_type], file, {}, options)
+          status
+        ensure
+          file.stop_progress_bar if file
+        end
+
         def get_cloud_config
           _, cloud_configs = get_json_with_status('/cloud_configs?limit=1')
           latest = cloud_configs.first

data/lib/cli/commands/restore.rb

@@ -0,0 +1,40 @@
+module Bosh::Cli::Command
+class Restore < Base
+    usage 'restore'
+    desc 'Restore BOSH director database'
+    def restore(path)
+      auth_required
+      show_current_state
+
+      nl
+      say("You are going to restore the director's database.".make_red)
+      nl
+      say('THIS IS A VERY DESTRUCTIVE OPERATION WHICH WILL DROP CURRENT DATABASE.'.make_red)
+      nl
+      say('IT CANNOT BE UNDONE!'.make_red)
+      nl
+
+      unless confirmed?
+        say('Canceled restoring database'.make_green)
+        return
+      end
+
+      err("The file `#{path}' does not exist.".make_red) unless File.exists?(path)
+      err("The file `#{path}' is not readable.".make_red) unless File.readable?(path)
+
+      nl
+      status = director.restore_db(path)
+      err("Failed to restore the database, the status is `#{status}'") unless status == 202
+      nl
+      say('Starting restore of BOSH director.')
+
+      result = director.check_director_restart(5, 600)
+
+      unless result
+        err('Restore database timed out.')
+      else
+        say('Restore done!'.make_green)
+      end
+    end
+  end
+end

data/lib/cli/version.rb

@@ -1,5 +1,5 @@
 module Bosh
   module Cli
-    VERSION = '1.3169.0'
+    VERSION = '1.3173.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bosh_cli
 version: !ruby/object:Gem::Version
-  version: 1.3169.0
+  version: 1.3173.0
 platform: ruby
 authors:
 - VMware
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-31 00:00:00.000000000 Z
+date: 2016-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bosh_common
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3169.0
+        version: 1.3173.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3169.0
+        version: 1.3173.0
 - !ruby/object:Gem::Dependency
   name: bosh-template
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3169.0
+        version: 1.3173.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3169.0
+        version: 1.3173.0
 - !ruby/object:Gem::Dependency
   name: cf-uaa-lib
   requirement: !ruby/object:Gem::Requirement
@@ -128,14 +128,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3169.0
+        version: 1.3173.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3169.0
+        version: 1.3173.0
 - !ruby/object:Gem::Dependency
   name: net-ssh
   requirement: !ruby/object:Gem::Requirement
@@ -382,6 +382,7 @@ files:
 - lib/cli/commands/release/reset_release.rb
 - lib/cli/commands/release/upload_release.rb
 - lib/cli/commands/release/verify_release.rb
+- lib/cli/commands/restore.rb
 - lib/cli/commands/snapshot.rb
 - lib/cli/commands/ssh.rb
 - lib/cli/commands/stemcell.rb