consistent-cluster 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 083d031971f3257c3484fe07f3a57ec3f128c540
-  data.tar.gz: e4672c6b95484ba06ecae0f227c72962d2b49d69
+  metadata.gz: 1a619832f972391c4026f17d7b373eee628a84dd
+  data.tar.gz: b84b0dcf405366e3caec3ed2968e775d54e7e875
 SHA512:
-  metadata.gz: 45d9b3225dd8f65df6e0c3be4a96c2198b865815fef6a17387ef0fb8c48e79fa58d3813f147588366cd75893cbde5a302843356c0e18f5fb30026bbe431b4b35
-  data.tar.gz: f2f031edcabcd583e32894914009fd0c1bf00a7216b0ffe799630182140bd4da12da0998e8c77c24f7fb371a1d94a8a90540221cf475a6eee769cc6e2d5d219f
+  metadata.gz: 4930145efffb208b04d2525f01f6821dfee4d26c18f3ec8a578ea56c7d98aa0c12ecf045929e8f1458d94fa33c7b18ff9e36602bf15f61764d8319da74879465
+  data.tar.gz: cdc9c0018a311e9ce11b5a8a40049edcd3d63b568d09a9e391de8e0d233bf395cd665f1cc7559f2d2342ca8e25b7a11810126f14520f734932e202573142576b

data/lib/consistent-cluster/demo/sync_client_debug.rb

@@ -11,24 +11,25 @@ all_config = {
   consistent_hashing_replicas: 100,
   create_proc: Proc.new { |zk_content|
     app_info = JSON.parse(zk_content)
-    ThriftClient.new("servers" => "#{app_info["host"]}:#{app_info["port"]}",
-                    "multiplexed" => app_info["serviceNames"].length > 1,
-                    "protocol" => 'binary',
-                    "transport" => 'socket',
-                    "framed" => false,
-                    "disconnect_exception_classes" => '',
-                    "application_exception_classes" => '',
-                    "size" => 1,
-                    "timeout" => 12,
-                    "client_class" => "HappyProfile::HappyProfileThriftService::Client",
-                    "test_on_borrow" => true,
-                    "pool_timeout" => 12)
+    client = ThriftClient.new(
+      "servers" => "#{app_info["host"]}:#{app_info["port"]}",
+      "multiplexed" => app_info["serviceNames"].length > 1,
+      "protocol" => 'binary',
+      "transport" => 'socket',
+      "framed" => false,
+      "disconnect_exception_classes" => '',
+      "application_exception_classes" => '',
+      "size" => 1,
+      "timeout" => 12,
+      "client_class" => "HappyProfile::HappyProfileThriftService::Client",
+      "test_on_borrow" => true,
+      "pool_timeout" => 12)
   },
   destroy_proc: Proc.new { |client|
     client.destroy
   },
   after_sync_proc: Proc.new { |info|
-    puts info.inspect
+    puts info.keys.inspect
   },
   zookeeper_service: "127.0.0.1:2181",
   zookeeper_path: "/test"

data/lib/consistent-cluster/demo/zk_debug.rb

@@ -16,14 +16,19 @@ def set(hash)
   $zk.set("#{$path}/#{app_name}",hash.to_json)
 end
 
-def delete(app)
-  $zk.delete("#{$path}/#{app}")
+def delete(hash)
+  app_name = hash[:id]
+  delete_with_app_name(app_name)
+end
+
+def delete_with_app_name(app_name)
+  $zk.delete("#{$path}/#{app_name}")
 end
 
 def clear
   apps = $zk.children($path)
-  apps.each do |app|
-    delete(app)
+  apps.each do |app_name|
+    delete_with_app_name(app_name)
   end
 end
 
@@ -42,7 +47,7 @@ app2 = {
   host: "127.0.0.1",
   port: "9092",
   id: "127.0.0.1:9092",
-  protocolType: "thrift",
+  protocolType: "thriftx",
   serviceNames: ["com.ximalaya.service.uts.api.thrift.IUserTrackRecordServiceHandler$Iface"]
 }
 
@@ -51,7 +56,7 @@ app3 = {
   host: "127.0.0.1",
   port: "9093",
   id: "127.0.0.1:9093",
-  protocolType: "thrift",
+  protocolType: "thriftxx",
   serviceNames: ["com.ximalaya.service.uts.api.thrift.IUserTrackRecordServiceHandler$Iface"]
 }
 
@@ -63,7 +68,36 @@ create(app2)
 
 create(app3)
 
-#set(app2)
+set(app2)
+
+delete(app2)
+
+create(app2)
+
+set(app2)
+
+delete(app2)
+
+create(app2)
+
+delete(app2)
+
+create(app2)
+
+set(app2)
+
+delete(app2)
+
+create(app2)
+
+set(app2)
+
+set(app1)
+
+set(app2)
+
+set(app3)
+
 
 
 

data/lib/consistent-cluster/sync-client.rb

@@ -3,8 +3,6 @@ require "consistent-cluster/version"
 
 require "consistent-cluster/consistent_hashing"
 
-gem "zk", "~> 1.9.5" #gem本身不默认依赖zk,此处补充依赖
-
 require "zk"
 
 module ConsistentCluster
@@ -17,6 +15,7 @@ module ConsistentCluster
 
       @data = {}
       @cluster = {}
+      @node_register = {}
 
       replicas = options[:consistent_hashing_replicas] || 3
       @ring = ConsistentHashing::Ring.new([],replicas)
@@ -38,7 +37,7 @@ module ConsistentCluster
 
     def shard(key=nil)
       cluster_sum = @cluster.length
-      raise "no service available" if cluster_sum < 1
+      raise "no service available at #{@path}" if cluster_sum < 1
       if key
         point = @ring.point_for(key)
         server = @cluster[point.node]
@@ -63,7 +62,7 @@ module ConsistentCluster
       @syncing = true
       while @to_sync
         @to_sync = false
-        app_names = sync_children
+        app_names = get_app_names
         current_app_names = @cluster.keys
 
         to_update = current_app_names&app_names
@@ -89,24 +88,31 @@ module ConsistentCluster
       end
     end
 
-    def sync_children
+    def get_app_names
       @zk.children(@path, watch: true)
     end
 
     def create_service(app_name)
 
+      app_path = "#{@path}/#{app_name}"
+      @node_register[app_name] = @zk.register(app_path) do |event|
+        sync_services
+      end
+
       app_content = get_app_content(app_name)
 
       server = @create_proc.call(app_content)
 
-      @data[app_name] = app_content
+      if server
 
-      @cluster[app_name] = server
+        @cluster[app_name] = server
 
-      @ring.add(app_name)
+        @ring.add(app_name)
+
+        @data[app_name] = app_content
+
+      end
 
-      app_path = "#{@path}/#{app_name}"
-      @zk.get(app_path, watch: true)
     rescue Exception => boom
       puts "sync create :#{app_name} raise #{boom.class} - #{boom.message}"
     end
@@ -123,6 +129,11 @@ module ConsistentCluster
         end
       end
 
+      reg = @node_register[app_name]
+      if reg
+        reg.unregister
+      end
+
     rescue Exception => boom
       puts "sync destroy :#{app_name} raise #{boom.class} - #{boom.message}"
     end
@@ -133,6 +144,7 @@ module ConsistentCluster
       app_content = get_app_content(app_name)
 
       cache_info = @data[app_name]
+
       if cache_info != app_content
         destroy_service(app_name)
         create_service(app_name)
@@ -143,7 +155,7 @@ module ConsistentCluster
 
     def get_app_content(app_name)
       app_path = "#{@path}/#{app_name}"
-      content = @zk.get(app_path).first
+      content = @zk.get(app_path, watch: true).first
       content
     end
 

data/lib/consistent-cluster/version.rb

@@ -1,3 +1,3 @@
 module ConsistentCluster
-  Version = "1.0.1"
+  Version = "1.0.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: consistent-cluster
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - jeffrey6052
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-26 00:00:00.000000000 Z
+date: 2015-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: atomic
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.99
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.99
+        version: '1.1'
 description: "用于整合服务集群接口，方便客户端调用; 调用方式包含一致性哈希逻辑,轮询逻辑; 支持绑定zookeeper,同步集群配置"
 email:
 - jeffrey6052@163.com
@@ -62,8 +62,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
-summary: ''
+summary: "一致性哈希集群"
 test_files: []