From 80a0fe8ac20a5e3c248a9c377fa09bc7e06487f0 Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Thu, 15 Jan 2015 23:54:16 +0000 Subject: admin: flesh out get_devices This adds the reject_bad_md5 and utilization fields. While we're at it, be more explicit with mapping and avoid creating an unnecessary hash. --- lib/mogilefs/admin.rb | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'lib/mogilefs') diff --git a/lib/mogilefs/admin.rb b/lib/mogilefs/admin.rb index a48aaa0..eeff6bd 100644 --- a/lib/mogilefs/admin.rb +++ b/lib/mogilefs/admin.rb @@ -64,17 +64,18 @@ class MogileFS::Admin < MogileFS::Client def get_devices(devid = nil) to_i = %w(mb_asof mb_free mb_used mb_total devid weight hostid) - want = %w(status observed_state).concat(to_i) + want = %w(status reject_bad_md5 observed_state utilization).concat(to_i) rv = @backend.get_devices(devid ? { :devid => devid } : {}) rv = clean('devices', 'dev', rv, true, to_i, want) - ostates = Hash[%w(readable writeable unreachable).map! { |f| [f,f] }] rv.each do |row| u = row["utilization"] and row["utilization"] = nil == u ? nil : u.to_f - # maps "" to nil (for dead devices) - row["observed_state"] = ostates[row["observed_state"]] + case row["observed_state"] + when "" + row["observed_state"] = nil + end # be sure we do not set this at all for pre-2.60 MogileFS-Server case row["reject_bad_md5"] -- cgit v1.2.3-24-ge0c7