leofs_manager_client 0.2.6 → 0.2.7

data/lib/leofs_manager_client/leofs_manager_models.rb

@@ -84,7 +84,7 @@ module LeoFSManager
 
   # Assigned file info Model
   class AssignedFile
-    attr_reader :node, :vnode_id, :size, :clock, :checksum, :timestamp, :delete
+    attr_reader :node, :vnode_id, :size, :clock, :checksum, :timestamp, :delete, :num_of_chunks
 
     def initialize(h)
       @node      = h[:node]
@@ -94,6 +94,7 @@ module LeoFSManager
       @checksum  = h[:checksum]
       @timestamp = h[:timestamp]
       @delete    = h[:delete]
+      @num_of_chunks = Integer(h[:num_of_chunks])
     end
   end
 

data/lib/leofs_manager_client.rb

@@ -26,21 +26,7 @@ require "time"
 require_relative "leofs_manager_client/leofs_manager_models"
 
 module LeoFSManager
-  VERSION = "0.2.6"
-
-  # Class for close TCP socket on GC.
-  class Remover
-    def initialize(data)
-      @data = data
-    end
-
-    # it will be called on GC.
-    def call(*args)
-      socket = @data[0]
-      socket.close if socket && !socket.closed?
-      warn "Closed socket: #{socket}" if $DEBUG
-    end
-  end
+  VERSION = "0.2.7"
 
   class Client
     CMD_VERSION          = "version"
@@ -69,8 +55,6 @@ module LeoFSManager
     def initialize(*servers)
       @servers = parse_servers(servers)
       set_current_server
-      final = Remover.new(@data = [])
-      ObjectSpace.define_finalizer(self, final)
       @mutex = Mutex.new
       connect
     end
@@ -184,10 +168,11 @@ module LeoFSManager
     # Remove an endpoint from the system
     # Return::
     #   _nil_
-    def s3_del_endpoint(endpoint)
+    def s3_delete_endpoint(endpoint)
       sender(CMD_S3_DEL_ENDPOINT % endpoint)
       nil
     end
+    alias :s3_del_endpoint :s3_delete_endpoint
 
     # Retrieve an endpoint in the system
     # Return::
@@ -213,6 +198,13 @@ module LeoFSManager
       buckets.map {|bucket| Bucket.new(bucket) }
     end
 
+    # Disconnect to LeoFS Manager explicitly
+    # Return::
+    #   _nil_
+    def disconnect!
+      disconnect
+    end
+
     ## ======================================================================
     ## PRIVATE
     ## ======================================================================
@@ -234,7 +226,8 @@ module LeoFSManager
     end
 
     def set_current_server
-      raise Error, "No servers to connect" if @servers.empty?
+      @servers.delete(@current_server) if @current_server
+      raise "No servers to connect" if @servers.empty?
       @current_server = @servers.first
     end
 
@@ -243,20 +236,30 @@ module LeoFSManager
       retry_count = 0
       begin
         @socket = TCPSocket.new(@current_server[:host], @current_server[:port])
-        @data[0] = @socket
       rescue => ex
         warn "Faild to connect: #{ex.class} (server: #{@current_server})"
         warn ex.message
         retry_count += 1
         if retry_count > 3
-          warn "Connecting another server..."
-          @socket.close if @socket && !@socket.closed?
-          @servers.delete(@current_server)
           set_current_server
+          warn "Connecting another server: #{@current_server}"
           retry_count = 0
         end
+        sleep 1
         retry
       end
+      @socket.autoclose = true
+      nil
+    end
+
+    def disconnect
+      @socket.close if @socket && !@socket.closed?
+    end
+
+    def reconnect
+      disconnect
+      sleep 1
+      connect
     end
 
     # Send a request to LeoFS Manager
@@ -267,8 +270,11 @@ module LeoFSManager
       begin
         @mutex.synchronize do
           @socket.puts command
-          response = JSON.parse(@socket.gets, symbolize_names: true)
+          response = JSON.parse(@socket.readline, symbolize_names: true)
         end
+      rescue EOFError => ex
+        warn "EOFError occured (server: #{@current_server})"
+        reconnect
       rescue => ex
         raise "An Error occured: #{ex.class} (server: #{@current_server})\n#{ex.message}"
       end

data/spec/leofs_manager_client_spec.rb

@@ -70,7 +70,8 @@ module Dummy
           :clock => "",
           :checksum => "",
           :timestamp => "",
-          :delete => 0
+          :delete => 0,
+          :num_of_chunks => 0
         }
       ]
     }.to_json
@@ -102,29 +103,32 @@ module Dummy
     Thread.new do
       TCPServer.open(Host, Port) do |server|
         loop do
-          socket = server.accept
-          while line = socket.gets.split.first
-            line.rstrip!
-            begin
-              case line
-              when "status"
-                result = Response::Status
-              when "s3-get-buckets"
-                result = Response::S3GetBuckets
-              when "whereis"
-                result = Response::Whereis
-              when "s3-get-endpoints"
-                result = Response::S3GetEndpoints
-              when "s3-get-buckets"
-                result = Response::S3GetBuckets
-              else
-                result = { :result => line }.to_json
+          begin
+            socket = server.accept
+            while line = socket.readline.split.first
+              line.rstrip!
+              begin
+                case line
+                when "status"
+                  result = Response::Status
+                when "s3-get-buckets"
+                  result = Response::S3GetBuckets
+                when "whereis"
+                  result = Response::Whereis
+                when "s3-get-endpoints"
+                  result = Response::S3GetEndpoints
+                when "s3-get-buckets"
+                  result = Response::S3GetBuckets
+                else
+                  result = { :result => line }.to_json
+                end
+              rescue => ex
+                result = { :error => ex.message }.to_json
+              ensure
+                socket.puts(result)
               end
-            rescue => ex
-              result = { :error => ex.message }.to_json
-            ensure
-              socket.puts(result)
             end
+          rescue EOFError
           end
         end
       end
@@ -147,79 +151,94 @@ NoResultAPIs = {
 include LeoFSManager
 
 describe LeoFSManager do
-  before(:all) do
-    Dummy::Manager.new
-    @manager = Client.new("#{Host}:#{Port}")
-  end
-
-  it "raises error when it is passed invalid params" do
-    lambda { Client.new }.should raise_error
-  end
-
-  describe "#status" do
-    it "returns Status" do
-      @manager.status.should be_a Status
+  describe Client do
+    before(:all) do
+      Dummy::Manager.new
+      @manager = Client.new("#{Host}:#{Port}")
     end
 
-    it "returns SystemInfo" do
-      @manager.status.system_info.should be_a Status::System
+    it "raises error when it is passed invalid params" do
+      lambda { Client.new }.should raise_error
     end
 
-    it "returns node list" do
-      node_list = @manager.status.node_list
-      node_list.should be_a Array
-      node_list.each do |node|
-        node.should be_a Status::Node
+    describe "#status" do
+      it "returns Status" do
+        @manager.status.should be_a Status
+      end
+
+      it "returns SystemInfo" do
+        @manager.status.system_info.should be_a Status::System
+      end
+
+      it "returns Array of Node" do
+        node_list = @manager.status.node_list
+        node_list.should be_a Array
+        node_list.each do |node|
+          node.should be_a Status::Node
+        end
       end
     end
-  end
 
-  describe "#whereis" do
-    it "returns Array of WhereInfo" do
-      result = @manager.whereis("path")
-      result.should be_a Array
-      result.each do |where_info|
-        where_info.should be_a AssignedFile
+    describe "#whereis" do
+      it "returns Array of WhereInfo" do
+        result = @manager.whereis("path")
+        result.should be_a Array
+        result.each do |where_info|
+          where_info.should be_a AssignedFile
+          where_info.num_of_chunks.should be_a Integer
+        end
+      end    
+    end
+
+    describe "#du" do
+      it "returns DiskUsage" do
+        @manager.du("node").should be_a StorageStat
       end
-    end    
-  end
+    end
 
-  describe "#du" do
-    it "returns DiskUsage" do
-      @manager.du("node").should be_a StorageStat
+    describe "#s3_gen_key" do
+      it "returns Credential" do
+        @manager.s3_gen_key("user_id").should be_a Credential
+      end 
     end
-  end
 
-  describe "#s3_gen_key" do
-    it "returns Credential" do
-      @manager.s3_gen_key("user_id").should be_a Credential
-    end 
-  end
+    describe "#s3_get_endpoints" do
+      it "returns Arrany of Endpoint" do
+        result = @manager.s3_get_endpoints
+        result.should be_a Array
+        result.each do |endpoint|
+          endpoint.should be_a Endpoint
+        end
+      end
+    end
 
-  describe "#s3_get_endpoints" do
-    it "returns Arrany of Endpoint" do
-      result = @manager.s3_get_endpoints
-      result.should be_a Array
-      result.each do |endpoint|
-        endpoint.should be_a Endpoint
+    describe "#s3_get_buckets" do
+      it "returns Array of Bucket" do
+        result = @manager.s3_get_buckets
+        result.should be_a Array
+        result.each do |buckets|
+          buckets.should be_a Bucket
+        end
       end
     end
-  end
 
-  describe "#s3_get_buckets" do
-    it "returns Array of Bucket" do
-      result = @manager.s3_get_buckets
-      result.should be_a Array
-      result.each do |buckets|
-        buckets.should be_a Bucket
+    NoResultAPIs.each do |api, num_of_args|
+      describe "##{api}" do
+        it "returns nil" do
+          @manager.send(api, *(["argument"] * num_of_args)).should be_nil
+        end
       end
     end
-  end
 
-  NoResultAPIs.each do |api, num_of_args|
-    describe "##{api}" do
+    describe "#disconnect!" do
       it "returns nil" do
-        @manager.send(api, *(["argument"] * num_of_args)).should be_nil
+        @manager.disconnect!.should be_nil
+      end
+
+      it "accepts no more requests" do
+        lambda {
+          @manager.status
+        }.should raise_error
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: leofs_manager_client
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.7
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-11 00:00:00.000000000 Z
+date: 2012-10-22 00:00:00.000000000 Z
 dependencies: []
 description: Client for LeoFS Manager
 email: