adhd 0.1.2 → 0.1.3

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.1.3

data/adhd.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{adhd}
-  s.version = "0.1.2"
+  s.version = "0.1.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["dave.hrycyszyn@headlondon.com"]

data/lib/adhd/models/content_shard.rb

@@ -52,11 +52,14 @@ class ContentShard
     # all nodes or the first available aside us and master
     all_good = true
     this_shard.node_list.each do |node_name|
+      # Do not sync with ourselves
+      next if (@our_node.name == node_name)
+    
        # Push all changes to the other nodes
        remote_node = Node.by_name(:key =>  node_name).first
        remote_db = remote_node.get_content_db(this_shard.shard_db_name)
-       all_good &= @our_node.replicate_to(this_shard_db, remote_node, remote_db)
-
+       bool_to = @our_node.replicate_to(this_shard_db, remote_node, remote_db)
+       all_good &= bool_to
        if !am_master && bool_to
          # NOTE: How to build skynet, Note 2
          #       We are doing some "gonzo" replication, here. Our master is

data/lib/adhd/node_manager.rb

@@ -127,6 +127,9 @@ module Adhd
     def build_node_content_databases
       # NOTE: we will have to refresh those then we are re-assigned shards
       @contentdbs = {} if !@contentdbs
+      
+      # This is a fresh version of the DB, and we should use it to 
+      # add, remove and *update* shards
       current_shards = @srdb.get_content_shards
 
       # Add the new shards
@@ -136,11 +139,20 @@ module Adhd
           conn = UpdateNotifierConnection.new(@config.node_url,
                                           @config.couchdb_server_port,
                                           @our_node.name + "_" + shard_db.this_shard.shard_db_name + "_content_db", # NOTE: Sooo ugly!
-                                          Proc.new { |data| shard_db.sync })
+                                          Proc.new { |data|
+                                            puts "SYNC #{shard_db.this_shard.shard_db_name} #{data}" 
+                                            
+                                            # Lazy evaluation to make sure we
+                                            # get the latest shard information
+                                            @contentdbs[cs][0].sync 
+                                            })
           @conn_manager.add_connection(conn)
 
           # Store both the shard object and the update notifier
           @contentdbs[cs] = [shard_db, conn]
+        else
+          # Keep the same connection, but update the shard information
+          @contentdbs[cs] = [current_shards[cs], @contentdbs[cs][1]]
         end
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: adhd
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors: 
 - dave.hrycyszyn@headlondon.com