ceph-crush-location 0.1.2 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 97aad1320dfffe37fb0c8312741aaab5f4b75994
-  data.tar.gz: cc35cdba6f0cdafc589d5e49deede2084722faad
+  metadata.gz: 8552b18a67fcc67b703bf323699962715fabf08e
+  data.tar.gz: 8ec2a6495a3218f7933845d7cafd668b1941be44
 SHA512:
-  metadata.gz: 8eec69aa68257f42e9257378374d2b39fa8222d0308280d1e249598bec49abd72e86036ad399eee874ae1d350200906c042c6aa3eabc995acc346f5057246cd8
-  data.tar.gz: bcf5016a248eba7ccbb2b0650686c761c364f31b379271d23d646eb938e6d331750fe1910e499b2d9aa1f1f8ad42dd814f30e5b3971f6aaf11acc1cba3d88ff6
+  metadata.gz: ea17ab665aed4c2d00b012305deb48b8967d8012aba35d956a672139f6ddf5fdd0bb8541aa4eacc81ecc95d6ca3184ccfa1c070dac636b75284143f0c25fa793
+  data.tar.gz: 7b3973deeef8835ef4e068cb8a6637d4886b824b52a6d66066885439e2d887c1ce5f87a50a2d3b68fa195073e05d1ab77bb00a6e42b501221cd9794a71bfd01e

data/README.md

@@ -36,6 +36,8 @@ the json file can take the following format
 
 Should this file not be available from this location, you can specify the location using `ENV['NODE_INFO']`
 
+Should this file be missing, or if it is corrupted, it will behave as if it was not there and behave as with the defaults
+
 Beyond that there are three lower types provided which are derived as follows:
     root # Crush root, either default, or read from /path/to/osd/crush_root
     disk_chassis # JBOD level of redundancy read from /path/to/osd/disk_chassis
@@ -55,6 +57,12 @@ Your crush ruleset will require the following types to use this gem:
     type 6 row
     type 7 datacenter
     type 8 root
+
+### Config crush_location
+
+For any daemon, ceph optionally provides a `crush_location` option that can be set in the cluster configuration file on the host this script is invoked. Providing this for will override the operation of this script and return that value instead.
+ie setting it for [osd] will override all OSDSs on this host, setting it for [osd.N] will override for that osd only.
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.

data/lib/ceph/crush/location/bucket.rb

@@ -8,8 +8,23 @@ module Ceph
           @osd = OSD.new
         end
 
+        def from_config
+          require 'shellwords'
+          ceph_conf_bin = '/usr/bin/ceph-conf'
+          cluster = ::Shellwords.escape @osd.cluster
+          type = 'osd'
+          id = ::Shellwords.escape @osd.id
+          location_command = "#{ceph_conf_bin} --cluster=#{cluster} "\
+                             "--name=#{type}.#{id} --lookup crush_location"
+          `#{location_command}`
+        rescue
+          ''
+        end
+
         def to_s
           Ceph::Crush::Location::Logger.send('Bucket.to_s')
+          ceph_location_config = from_config
+          return ceph_location_config unless ceph_location_config == ''
           [root_bucket, datacenter_bucket,
            row_bucket, rack_bucket, chassis_bucket,
            host_bucket, disk_chassis_bucket, enclosure_bucket].join('')

data/lib/ceph/crush/location/node_info/parser.rb

@@ -9,6 +9,8 @@ module Ceph
           Ceph::Crush::Location.nodeinfo = JSON.parse(
             ::File.read(Ceph::Crush::Location.options[:nodeinfo])
           )
+        rescue
+          Ceph::Crush::Location.nodeinfo = {}
         end
       end
     end

data/lib/ceph/crush/location/options/parser.rb

@@ -14,6 +14,7 @@ module Ceph
             def parse!
               ::Ceph::Crush::Location::Logger.send('parsing attributes')
               ::Ceph::Crush::Location.options = {}
+              ::Ceph::Crush::Location.options[:cluster] = 'ceph'
               grab!
               validate!
               default_env
@@ -36,7 +37,7 @@ module Ceph
             end
 
             def report(e)
-              ::Ceph::Crush::Location::Logger.send(e, Logger::ERROR)
+              ::Ceph::Crush::Location::Logger.send(e, ::Logger::ERROR)
               STDERR.puts "#{$PROGRAM_NAME}: #{e}"
               exit(-1)
             end
@@ -50,7 +51,7 @@ module Ceph
 
             def options(opts)
               Ceph::Crush::Location::Logger.send('Options::Parser.options')
-              opts.on('-c', '--cluster CLUSTER', 'Specify Cluster Name') do |c|
+              opts.on('-c', '--cluster [CLUSTER]', 'Specify Cluster') do |c|
                 ::Ceph::Crush::Location.options[:cluster] = c
               end
 
@@ -90,9 +91,6 @@ module Ceph
 
             def validate!
               Ceph::Crush::Location::Logger.send('Options::Parser.validate!')
-              ::Ceph::Crush::Location.options.fetch(:cluster) do
-                raise OptionParser::MissingArgument, 'no \'cluster\' provided'
-              end
               ::Ceph::Crush::Location.options.fetch(:id) do
                 raise OptionParser::MissingArgument, 'no \'id\' provided'
               end

data/lib/ceph/crush/location/version.rb

@@ -1,7 +1,7 @@
 module Ceph
   module Crush
     module Location
-      VERSION = '0.1.2'.freeze
+      VERSION = '0.1.4'.freeze
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ceph-crush-location
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.4
 platform: ruby
 authors:
 - Stuart Harland
@@ -98,7 +98,7 @@ description:
 email:
 - s.harland@livelinktechnology.net
 executables:
-- crush-location.rb
+- ceph-crush-location.rb
 extensions: []
 extra_rdoc_files: []
 files:
@@ -112,7 +112,7 @@ files:
 - bin/console
 - bin/setup
 - ceph-crush-location.gemspec
-- exe/crush-location.rb
+- exe/ceph-crush-location.rb
 - lib/ceph/crush/location.rb
 - lib/ceph/crush/location/bucket.rb
 - lib/ceph/crush/location/logger.rb