continuent-tools-core 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d4e0a602b7a4383ac128219b0d25dc365dbe72f0
-  data.tar.gz: 61a2d564fe9dc122d58a0c7a6fa2c063aae26f24
+  metadata.gz: 2b7b64099ff0f37bfcbaa4afa998993a4e023b74
+  data.tar.gz: 58ebccaa84312b4a8e4f2b1f7365c44c7fa9d5f9
 SHA512:
-  metadata.gz: c67fc00dd70e2d36af541fab0c29199ba93764e85cc3b8030cbc95d18c7eb341561643a4a2cb8f593acf39e81744f056db45f003efd99e0694c44d1ff1d7f5da
-  data.tar.gz: 43c45657e6bad3b0ad1fb23e58e43ce1844bb0599a90858c3ebfb39d186af7154bcad9d2f6b3f316bdb2a56f7373a35aeec902e731e174a6218a7413cee60f6d
+  metadata.gz: 04bdffb22ff4b6152d423afbcbbfbd8315196e23c9f90a6eec80425d13976e0a42bdfe0bdbd7a4ec883ed3f2dc5e7c6d177a8fcd5064170cb47e46db794caf24
+  data.tar.gz: 9b6b04384b36919462ab7e5a4a455f58f2e1442419492a1ae05ca3c0acb9350f1a76ff063769e818c1f750164f5173506ace560f9308362dec10e20fe5221708

data/lib/tungsten/exec.rb

@@ -238,6 +238,19 @@ class TungstenUtil
 
     return
   end
+  
+  # A wrapper for running another Tungsten script. This will automatically
+  # forward messages to the console and add any TungstenScript options to 
+  # the command.
+  def tungsten_cmd_result(command)
+    original_fwd_state = forward_cmd_results?()
+    begin
+      forward_cmd_results?(true)
+      return cmd_result("#{command} #{get_tungsten_command_options()}")
+    ensure
+      forward_cmd_results?(original_fwd_state)
+    end
+  end
 
   # Run a standard check to see if SSH connectivity to the host works
   def test_ssh(host, user)

data/lib/tungsten/install.rb

@@ -52,10 +52,17 @@ class TungstenInstall
     end
   end
   
+  # Path to the install directory for Continuent Tungsten. This will include 
+  # all previous releases and a symlink to the current running version.
   def root
     @root
   end
   
+  # Path to the current running version of Continuent Tungsten.
+  def base_path
+    "#{@root}/#{CURRENT_RELEASE_DIRECTORY}"
+  end
+  
   def hostname
     setting("host_name")
   end
@@ -79,7 +86,12 @@ class TungstenInstall
     if is_manager?()
       setting("dataservice_name")
     elsif is_replicator?()
-      local_services = TU.cmd_result("egrep -l \"^replicator.service.type=local\" #{@root}/#{CURRENT_RELEASE_DIRECTORY}/tungsten-replicator/conf/static*").split("\n")
+      begin
+        local_services = TU.cmd_result("egrep -l \"^replicator.service.type=local\" #{@root}/#{CURRENT_RELEASE_DIRECTORY}/tungsten-replicator/conf/static*").split("\n")
+      rescue
+        local_services = []
+      end
+      
       if local_services.size() == 0
         dataservices().get(0)
       else
@@ -91,7 +103,11 @@ class TungstenInstall
   end
   
   def replication_services
-    TU.cmd_result("egrep \"^service.name\" #{@root}/#{CURRENT_RELEASE_DIRECTORY}/tungsten-replicator/conf/static-* | awk -F \"=\" '{print $2}'").split("\n")
+    begin
+      TU.cmd_result("egrep \"^service.name\" #{@root}/#{CURRENT_RELEASE_DIRECTORY}/tungsten-replicator/conf/static-* | awk -F \"=\" '{print $2}'").split("\n")
+    rescue
+      []
+    end
   end
   
   def tpm
@@ -141,19 +157,37 @@ class TungstenInstall
       if third == nil
         raise "Unable to create setting key for #{first}.#{second}"
       end
-      "#{first}.#{TU.to_identifier(second)}.#{third}"
+      
+      service_aliases = setting(setting_key(HOSTS, "deployment_dataservice_aliases"))
+      unless service_aliases.has_key?(second)
+        raise "Unable to find a configuration alias for the #{second} service"
+      end
+      
+      "#{first}.#{TU.to_identifier(service_aliases[second])}.#{third}"
     elsif first == HOSTS
       "#{first}.#{TU.to_identifier(hostname())}.#{second}"
     elsif first == MANAGERS
       if third == nil
         raise "Unable to create setting key for #{first}.#{second}"
       end
-      "#{first}.#{TU.to_identifier(second)}_#{TU.to_identifier(hostname())}.#{third}"
+      
+      service_aliases = setting(setting_key(HOSTS, "deployment_dataservice_aliases"))
+      unless service_aliases.has_key?(second)
+        raise "Unable to find a configuration alias for the #{second} service"
+      end
+      
+      "#{first}.#{TU.to_identifier(service_aliases[second])}_#{TU.to_identifier(hostname())}.#{third}"
     elsif first == REPL_SERVICES
       if third == nil
         raise "Unable to create setting key for #{first}.#{second}"
       end
-      "#{first}.#{TU.to_identifier(second)}_#{TU.to_identifier(hostname())}.#{third}"
+      
+      service_aliases = setting(setting_key(HOSTS, "deployment_dataservice_aliases"))
+      unless service_aliases.has_key?(second)
+        raise "Unable to find a configuration alias for the #{second} service"
+      end
+      
+      "#{first}.#{TU.to_identifier(service_aliases[second])}_#{TU.to_identifier(hostname())}.#{third}"
     else
       "#{first}.#{TU.to_identifier(hostname())}.#{second}"
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: continuent-tools-core
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Continuent