leofs_manager_client 0.2.16 → 0.4.0

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    ODBjNTNiNmU3MDRkZjc0NmI2MWFjNzk2Y2MyMzc0OTc0MGY1MGVjMg==
+  data.tar.gz: !binary |-
+    NjRkODI0YmJjNWZjNjFiMGMzOTkwMmIxZjEyNDEwOTQ5ODVkYjkxNA==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    ZWVhZWU3YmU3MTFiN2M1OWU4NzA0NjY1M2FlYzhiMDAxN2U3OTk1ZTg5ZTNk
+    YzI4Y2IyMWQwYTljNDQyMjM0YmY4MGMyZGUyYzAxY2MwYWJmZWI3NjdiMTU0
+    NDZiMWI5NWU3ZjRhYWM4M2FhOWRmNDFhNzdhNmI4OWNkZjkwOGY=
+  data.tar.gz: !binary |-
+    NzQyMDI3NTA4YWQyNmU4NTEyMGQ4ODY2OTYwNDI5Yzc3YjE0ZTM0YzZjZWFl
+    MTk5MzcxNGE1ZGFhNTg1MDFmMTE5ZGY4MDFiMDk2YTU3YzllOTkzODk0NDEy
+    MTQ2ZGE5OTUyMGZlYTk3MDE5ZGY1YjQzMjhmMjMwMTZkOWY4ZmE=

data/lib/leofs_manager_client/leofs_manager_models.rb

@@ -20,7 +20,10 @@
 #
 # ======================================================================
 module LeoFSManager
+
+  # ==========================
   # System Information Model
+  # ==========================
   class Status
     # Node
     attr_reader :node_stat
@@ -93,7 +96,9 @@ module LeoFSManager
     end
   end
 
+  # ==========================
   # Assigned file info Model
+  # ==========================
   class AssignedFile
     attr_reader :node, :vnode_id, :size, :clock, :checksum, :timestamp, :delete, :num_of_chunks
 
@@ -110,7 +115,9 @@ module LeoFSManager
     end
   end
 
+  # ==========================
   # Storage Status Model
+  # ==========================
   class StorageStat
     attr_reader :active_num_of_objects, :total_num_of_objects,
                 :active_size_of_objects, :total_size_of_objects,
@@ -123,15 +130,9 @@ module LeoFSManager
       @total_num_of_objects   = h[:total_num_of_objects]
       @active_size_of_objects = h[:active_size_of_objects]
       @total_size_of_objects  = h[:total_size_of_objects]
-
-      last_compaction_start = h[:last_compaction_start]
-      if last_compaction_start && last_compaction_start != "____-_-__- __:__:__"
-        @last_compaction_start = Time.parse(h[:last_compaction_start])
-      end
-      last_compaction_end = h[:last_compaction_end]
-      if last_compaction_end && last_compaction_end != "____-_-__- __:__:__"
-        @last_compaction_end = Time.parse(h[:last_compaction_end])
-      end
+      @ratio_of_active_size   = h[:ratio_of_active_size]
+      @last_compaction_start = h[:last_compaction_start]
+      @last_compaction_end = h[:last_compaction_end]
     end
 
     def file_size
@@ -139,7 +140,9 @@ module LeoFSManager
     end
   end
 
-  # S3 Credential
+  # ==========================
+  # S3 Credential Model
+  # ==========================
   class Credential
     # AWS_ACCESS_KEY_ID
     attr_reader :access_key_id
@@ -152,6 +155,9 @@ module LeoFSManager
     end
   end
 
+  # ==========================
+  # Login Info Model
+  # ==========================
   RoleDef = {
     1 => :general,
     9 => :admin
@@ -176,6 +182,9 @@ module LeoFSManager
     end
   end
 
+  # ==========================
+  # User Info Model
+  # ==========================
   class User
     attr_reader :user_id, :role_id, :access_key_id, :created_at
 
@@ -191,7 +200,9 @@ module LeoFSManager
     end
   end
 
-  # Endpoint
+  # ==========================
+  # Endpoint Model
+  # ==========================
   class Endpoint
     # host of the endpoint
     attr_reader :endpoint
@@ -204,7 +215,9 @@ module LeoFSManager
     end
   end
 
+  # ==========================
   # S3-Bucket Model
+  # ==========================
   class Bucket
     # name of bucket
     attr_reader :name
@@ -219,4 +232,25 @@ module LeoFSManager
       @created_at = Time.parse(h[:created_at])
     end
   end
+
+  # ==========================
+  # Compaction Status Model
+  # ==========================
+  class CompactionStatus
+    attr_reader :status
+    attr_reader :last_compaction_start
+    attr_reader :total_targets
+    attr_reader :num_of_pending_targets
+    attr_reader :num_of_ongoing_targets
+    attr_reader :num_of_out_of_targets
+
+    def initialize(h)
+      @status                 = h[:status]
+      @last_compaction_start  = h[:last_compaction_start]
+      @total_targets          = h[:total_targets]
+      @num_of_pending_targets = h[:num_of_pending_targets]
+      @num_of_ongoing_targets = h[:num_of_ongoing_targets]
+      @num_of_out_of_targets  = h[:num_of_out_of_targets]
+    end
+  end
 end

data/lib/leofs_manager_client.rb

@@ -26,7 +26,7 @@ require "time"
 require_relative "leofs_manager_client/leofs_manager_models"
 
 module LeoFSManager
-  VERSION = "0.2.16"
+  VERSION = "0.4.0"
 
   class Client
     CMD_VERSION          = "version"
@@ -39,7 +39,10 @@ module LeoFSManager
     CMD_REBALANCE        = "rebalance"
     CMD_WHEREIS          = "whereis %s"
     CMD_DU               = "du %s"
-    CMD_COMPACT          = "compact %s"
+    CMD_COMPACT_START    = "compact start %s %s %s"
+    CMD_COMPACT_SUSPEND  = "compact suspend %s"
+    CMD_COMPACT_RESUME   = "compact resume %s"
+    CMD_COMPACT_STATUS   = "compact status %s"
     CMD_PURGE            = "purge %s"
     CMD_CRE_USER         = "create-user %s %s"
     CMD_UPD_USER_ROLE    = "update-user-role %s %s"
@@ -66,7 +69,7 @@ module LeoFSManager
       connect
     end
 
-    # servers to connect 
+    # servers to connect
     attr_reader :servers
     # the server currently connected
     attr_reader :current_server
@@ -81,7 +84,7 @@ module LeoFSManager
 
     # Retrieve LeoFS's system status from LeoFS Manager
     # Return::
-    #   Status 
+    #   Status
     def status(node=nil)
       Status.new(sender(CMD_STATUS % node))
     end
@@ -148,14 +151,38 @@ module LeoFSManager
       StorageStat.new(sender(CMD_DU % node))
     end
 
-    # Execute 'compaction'
+    # Execute 'compact start'
     # Return::
     #   _nil_
-    def compact(node)
-      sender(CMD_COMPACT % node)
+    def compact_start(node, num_of_targets, num_of_concurrents)
+      sender(CMD_COMPACT_START % [node, num_of_targets, num_of_concurrents])
       nil
     end
 
+    # Execute 'compact suspend'
+    # Return::
+    #   _nil_
+    def compact_suspend(node)
+      sender(CMD_COMPACT_SUSPEND % node)
+      nil
+    end
+
+    # Execute 'compact suspend'
+    # Return::
+    #   _nil_
+    def compact_resume(node)
+      sender(CMD_COMPACT_RESUME % node)
+      nil
+    end
+
+    # Execute 'compact status'
+    # Return::
+    #   _nil_
+    def compact_status(node)
+      compaction = sender(CMD_COMPACT_STATUS % node)[:compaction_status]
+      CompactionStatus.new(compaction)
+    end
+
     # Purge a cache in gateways
     # Return::
     #   _nil_
@@ -341,4 +368,6 @@ if __FILE__ == $PROGRAM_NAME
   p m.status("storage_0@127.0.0.1")
   p m.get_buckets()
   p m.whereis("photo/hawaii-0.jpg")
+  p m.du("storage_0@127.0.0.1")
+  p m.compact_status("storage_0@127.0.0.1")
 end

data/spec/dummy_tcp_server.rb

@@ -1,23 +1,23 @@
 # ======================================================================
-# 
+#
 #  LeoFS Manager Client
-# 
+#
 #  Copyright (c) 2012 Rakuten, Inc.
-# 
+#
 #  This file is provided to you under the Apache License,
 #  Version 2.0 (the "License"); you may not use this file
 #  except in compliance with the License.  You may obtain
 #  a copy of the License at
-# 
+#
 #    http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 #  Unless required by applicable law or agreed to in writing,
 #  software distributed under the License is distributed on an
 #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 #  KIND, either express or implied.  See the License for the
 #  specific language governing permissions and limitations
 #  under the License.
-# 
+#
 # ======================================================================
 
 require "socket"
@@ -65,7 +65,7 @@ module Dummy
 
     Whereis = {
       :assigned_info => [
-        { 
+        {
           :node => "storage_0@127.0.0.1",
           :vnode_id => "",
           :size => "",
@@ -78,35 +78,23 @@ module Dummy
       ]
     }.to_json
 
-    GetEndpoints = {
-      :endpoints => [
-        {:endpoint => "s3.amazonaws.com", :created_at=>"2012-09-21 15:08:11 +0900"},
-        {:endpoint => "localhost", :created_at=>"2012-09-21 15:08:11 +0900"},
-        {:endpoint => "foo", :created_at=>"2012-09-21 18:51:08 +0900"},
-        {:endpoint => "leofs.org", :created_at=>"2012-09-21 15:08:11 +0900"}
-      ]
-    }.to_json
+    GetEndpoints = {:endpoints => [{:endpoint => "s3.amazonaws.com", :created_at=>"2012-09-21 15:08:11 +0900"},
+                                   {:endpoint => "localhost",        :created_at=>"2012-09-21 15:08:11 +0900"},
+                                   {:endpoint => "foo",              :created_at=>"2012-09-21 18:51:08 +0900"},
+                                   {:endpoint => "leofs.org",        :created_at=>"2012-09-21 15:08:11 +0900"}
+                                  ]}.to_json
+    GetBuckets = {:buckets => [{:bucket => "test",
+                                :owner => "test",
+                                :created_at => "2012-09-24 15:38:49 +0900"
+                               }]}.to_json
 
-    GetBuckets = {
-      :buckets => [
-        {
-          :bucket => "test",
-          :owner => "test",
-          :created_at => "2012-09-24 15:38:49 +0900"
-        }
-      ]
-    }.to_json
+    GetUsers = {:users => [{:access_key_id => "05236",
+                             :user_id => "_test_leofs_",
+                             :role_id => 1,
+                             :created_at => "2012-11-20 15:13:20 +0900"}]}.to_json
 
-    GetUsers = {
-      :users => [
-        { :access_key_id => "05236", :user_id => "_test_leofs_", :role_id => 1, :created_at => "2012-11-20 15:13:20 +0900" }
-      ]
-    }.to_json
-
-    CreateUser = {
-      :access_key_id => "xxxxxxxxxxxxxxxxxxxx",
-      :secret_access_key => "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
-    }.to_json
+    CreateUser = {:access_key_id => "xxxxxxxxxxxxxxxxxxxx",
+                  :secret_access_key => "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"}.to_json
   end
 
   Argument = "arg" # passed to command which requires some arguments.

data/spec/leofs_manager_client_spec.rb

@@ -1,23 +1,23 @@
 # ======================================================================
-# 
+#
 #  LeoFS Manager Client
-# 
+#
 #  Copyright (c) 2012 Rakuten, Inc.
-# 
+#
 #  This file is provided to you under the Apache License,
 #  Version 2.0 (the "License"); you may not use this file
 #  except in compliance with the License.  You may obtain
 #  a copy of the License at
-# 
+#
 #    http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 #  Unless required by applicable law or agreed to in writing,
 #  software distributed under the License is distributed on an
 #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 #  KIND, either express or implied.  See the License for the
 #  specific language governing permissions and limitations
 #  under the License.
-# 
+#
 # ======================================================================
 
 require "json"
@@ -31,13 +31,13 @@ $DEBUG = false
 
 # key: api_name, value: num of args
 NoResultAPIs = {
-  :start => 0, 
-  :detach => 1, 
-  :rebalance => 0, 
-  :compact => 1, 
+  :start => 0,
+  :detach => 1,
+  :rebalance => 0,
+  :compact => 1,
   :purge => 1,
-  :set_endpoint => 1, 
-  :del_endpoint => 1, 
+  :set_endpoint => 1,
+  :del_endpoint => 1,
   :add_bucket => 2
 }
 
@@ -54,14 +54,14 @@ describe LeoFSManager do
 
     context "there is no last compaction" do
       subject do
-        StorageStat.new(
-          :active_num_of_objects => 0,
-          :total_num_of_objects => 0,
-          :active_size_of_objects => 0,
-          :total_size_of_objects => 0,
-          :last_compaction_start => "____-_-__- __:__:__",
-          :last_compaction_end => "____-_-__- __:__:__"
-        )
+        StorageStat.new(:active_num_of_objects => 0,
+                        :total_num_of_objects => 0,
+                        :active_size_of_objects => 0,
+                        :total_size_of_objects => 0,
+                        :ratio_of_active_size => "0.0%"
+                        :last_compaction_start => "____-_-__- __:__:__",
+                        :last_compaction_end => "____-_-__- __:__:__"
+                        )
       end
 
       it_behaves_like StorageStat
@@ -83,7 +83,7 @@ describe LeoFSManager do
           :last_compaction_end => time_str
         )
       end
-    
+
       it_behaves_like StorageStat
 
       its(:last_compaction_start) { subject.to_s == time_str }
@@ -128,7 +128,7 @@ describe LeoFSManager do
           where_info.should be_a AssignedFile
           where_info.num_of_chunks.should be_a Integer
         end
-      end    
+      end
     end
 
     describe "#du" do
@@ -140,7 +140,7 @@ describe LeoFSManager do
     describe "#create_user" do
       it "returns Credential" do
         subject.create_user("user_id", "password").should be_a Credential
-      end 
+      end
 
       it "goes with only user_id" do
         subject.create_user("user_id").should be_a Credential

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: leofs_manager_client
 version: !ruby/object:Gem::Version
-  version: 0.2.16
-  prerelease: 
+  version: 0.4.0
 platform: ruby
 authors:
 - Masaki Matsushita
@@ -10,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-21 00:00:00.000000000 Z
+date: 2013-03-12 00:00:00.000000000 Z
 dependencies: []
 description: Client for LeoFS Manager
 email:
@@ -31,27 +30,26 @@ files:
 - spec/leofs_manager_client_spec.rb
 homepage: ''
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.0.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Client for LeoFS Manager
 test_files:
 - spec/dummy_tcp_server.rb