cuboid 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d6c97e639d098be63229081135c1932933631063155f23f675f3eb09c12ff321
-  data.tar.gz: 11831be1794a18051dd5e3851615d8b5f1b65201265fd6d4d19366754940c87c
+  metadata.gz: ca74705ed31ac31d5e2dc69901fe2815df25e6fbcf30337d242ca2d1059624af
+  data.tar.gz: fc01ac528305655c7369cbe5af27fe5b2ffb8b03969c8f2b1d45df842d082c4d
 SHA512:
-  metadata.gz: 4de63384fca1ec59a9e6a14ef7f8cacedc7bb3ea8674050fae925a6051ebf2c9e54888f015a9844c602cfaf043fe04d457ed8663e112477620cd625cf615ad29
-  data.tar.gz: 3908975b45d9e601918fd9cd852c8cebcdf007c34a5a350d9ab709a86d0a41b8a544163a92b828c718bf4c01045e7ffdfd704eaaacc0ebda1d00ea7edd245632
+  metadata.gz: 618a9ac640b379063ea2710688c82345088043db0b0975467cd99ae363b3f376c08bb9d6116e0b77f2018510bda0a154e0ef53c1c2e795748cb692203da81d01
+  data.tar.gz: 92aab5e52a4477ceaf6ce48a4689bd86fa61f27a0c2a2243b0e4f6c1d812fb736bdeeb9d82cebf89ae058e92478301d2586f7a4ca355bf7f8268ebf8dc179110

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 0.2.3
+
+* Simplified convergence of P2P mesh network.
+
 # 0.2.2
 
 * `Processes::Manager`

data/lib/cuboid/rpc/server/agent/node.rb

@@ -38,26 +38,24 @@ class Server::Agent::Node
 
         reroute_to_file( logfile ) if logfile
 
-        print_status 'Initializing grid node...'
+        print_status 'Initializing node...'
 
         @dead_nodes = Set.new
-        @peers = Set.new
+        @peers      = Set.new
         @nodes_info_cache = []
 
         if (peer = @options.agent.peer)
             # Grab the peer's peers.
-            connect_to_peer( peer ).peers do |urls|
-                if urls.rpc_exception?
-                    add_dead_peer( peer )
-                    print_info "Neighbour seems dead: #{peer}"
+            connect_to_peer( peer ).peers do |peers|
+                if peers.rpc_exception?
+                    print_info "Peer seems dead: #{peer}"
                     add_dead_peer( peer )
                     next
                 end
 
-                # Add peer and announce it to everyone.
-                add_peer( peer, true )
-
-                urls.each { |url| @peers << url if url != @url }
+                peers << peer
+                peers.each { |url| add_peer url }
+                announce @url
             end
         end
 
@@ -92,24 +90,11 @@ class Server::Agent::Node
     #
     # @param    [String]    node_url
     #   URL of a peering node.
-    # @param    [Boolean]   propagate
-    #   Whether or not to announce the new node to the peers.
-    def add_peer( node_url, propagate = false )
-        # we don't want ourselves in the Set
-        return false if node_url == @url
-        return false if @peers.include?( node_url )
-
+    def add_peer( node_url )
         print_status "Adding peer: #{node_url}"
 
         @peers << node_url
         log_updated_peers
-        announce( node_url ) if propagate
-
-        connect_to_peer( node_url ).add_peer( @url, propagate ) do |res|
-            next if !res.rpc_exception?
-            add_dead_peer( node_url )
-            print_status "Neighbour seems dead: #{node_url}"
-        end
         true
     end
 
@@ -120,7 +105,7 @@ class Server::Agent::Node
     end
 
     # @return   [Array]
-    #   Neighbour/node/peer URLs.
+    #   Peer/node/peer URLs.
     def peers
         @peers.to_a
     end
@@ -136,7 +121,7 @@ class Server::Agent::Node
             each = proc do |peer, iter|
                 connect_to_peer( peer ).info do |info|
                     if info.rpc_exception?
-                        print_info "Neighbour seems dead: #{peer}"
+                        print_info "Peer seems dead: #{peer}"
                         add_dead_peer( peer )
                         log_updated_peers
 
@@ -165,8 +150,8 @@ class Server::Agent::Node
     #   * `peers` -- Array of peers.
     def info
         {
-            'url'                    => @url,
-            'name'                   => @options.agent.name,
+            'url'               => @url,
+            'name'              => @options.agent.name,
             'peers'             => @peers.to_a,
             'unreachable_peers' => @dead_nodes.to_a
         }
@@ -209,7 +194,7 @@ class Server::Agent::Node
             peer.alive? do |res|
                 next if res.rpc_exception?
 
-                print_status "Agent came back to life: #{url}"
+                print_status "Peer came back to life: #{url}"
                 ([@url] | peers).each do |node|
                     peer.add_peer( node ){}
                 end
@@ -225,12 +210,10 @@ class Server::Agent::Node
     # @param    [String]    node
     #   URL
     def announce( node )
-        print_status "Advertising: #{node}"
+        print_status "Announcing: #{node}"
 
         peers.each do |peer|
-            next if peer == node
-
-            print_info '---- to: ' + peer
+            print_info "---- to: #{peer}"
             connect_to_peer( peer ).add_peer( node ) do |res|
                 add_dead_peer( peer ) if res.rpc_exception?
             end

data/lib/version

@@ -1 +1 @@
-0.2.2
+0.2.3

data/spec/cuboid/rpc/server/agent/node_spec.rb

@@ -24,7 +24,7 @@ describe Cuboid::RPC::Server::Agent::Node do
     end
 
     before( :each ) do
-        options.paths.executables        = "#{fixtures_path}executables/"
+        options.paths.executables   = "#{fixtures_path}executables/"
         options.agent.ping_interval = 0.5
     end
     after( :each )  do
@@ -65,7 +65,6 @@ describe Cuboid::RPC::Server::Agent::Node do
 
             sleep 0.5
             expect(subject.peers).to eq([c.url])
-            expect(c.peers).to eq([subject.url])
         end
     end
 
@@ -76,7 +75,6 @@ describe Cuboid::RPC::Server::Agent::Node do
             subject.add_peer( c.url )
             sleep 0.5
 
-            expect(c.peers).to eq([subject.url])
             expect(subject.peers).to eq([c.url])
 
             subject.shutdown rescue break while sleep 0.1
@@ -117,7 +115,6 @@ describe Cuboid::RPC::Server::Agent::Node do
 
             subject.add_peer( c.url )
             sleep 0.5
-            expect(c.peers).to eq([subject.url])
 
             c.unplug
 
@@ -136,35 +133,6 @@ describe Cuboid::RPC::Server::Agent::Node do
 
         it 'adds a peer' do
             expect(subject.peers).to eq([other.url])
-            expect(other.peers).to eq([subject.url])
-        end
-
-        context 'when propagate is set to true' do
-            it 'announces the new peer to the existing peers' do
-                n = get_node
-                subject.add_peer( n.url, true )
-                sleep 0.5
-
-                expect(subject.peers.sort).to eq([other.url, n.url].sort)
-                expect(other.peers.sort).to eq([subject.url, n.url].sort)
-
-                c = get_node
-                n.add_peer( c.url, true )
-                sleep 0.5
-
-                expect(subject.peers.sort).to eq([other.url, n.url, c.url].sort)
-                expect(other.peers.sort).to eq([subject.url, n.url, c.url].sort)
-                expect(c.peers.sort).to eq([subject.url, n.url, other.url].sort)
-
-                d = get_node
-                d.add_peer( c.url, true )
-                sleep 0.5
-
-                expect(subject.peers.sort).to eq([d.url, other.url, n.url, c.url].sort)
-                expect(other.peers.sort).to eq([d.url, subject.url, n.url, c.url].sort)
-                expect(c.peers.sort).to eq([d.url, subject.url, n.url, other.url].sort)
-                expect(d.peers.sort).to eq([c.url, subject.url, n.url, other.url].sort)
-            end
         end
     end
 

data/spec/cuboid/rpc/server/agent_spec.rb

@@ -226,13 +226,13 @@ describe Cuboid::RPC::Server::Agent do
                           daemonize: true
                         )
                         d3.spawn( strategy: :direct )
-                        preferred = d3.url.split( ':' ).first
 
+                        preferred = d3.url.split( ':' ).first
                         expect(d3.spawn(strategy: :horizontal )['url'].split( ':' ).first).to eq(preferred)
                         expect(%W{127.0.0.3 127.0.0.2}).to include d1.spawn['url'].split( ':' ).first
                         expect(d2.spawn(strategy: :horizontal )['url'].split( ':' ).first).to eq(preferred)
+                        expect(%W{127.0.0.1 127.0.0.2}).to include d3.spawn(strategy: :horizontal )['url'].split( ':' ).first
                         expect(%W{127.0.0.1 127.0.0.3}).to include d3.spawn(strategy: :horizontal )['url'].split( ':' ).first
-                        expect(%W{127.0.0.2 127.0.0.3}).to include d3.spawn(strategy: :horizontal )['url'].split( ':' ).first
                         expect(%W{127.0.0.2 127.0.0.3}).to include d1.spawn(strategy: :horizontal )['url'].split( ':' ).first
                     end
                 end
@@ -303,14 +303,14 @@ describe Cuboid::RPC::Server::Agent do
                           daemonize: true
                         )
                         d3.spawn( strategy: :direct )
-                        preferred = d3.url.split( ':' ).first
 
-                        expect(d3.spawn['url'].split( ':' ).first).to eq(preferred)
+                        preferred = d3.url.split( ':' ).first
+                        expect(d3.spawn(strategy: :horizontal )['url'].split( ':' ).first).to eq(preferred)
                         expect(%W{127.0.0.3 127.0.0.2}).to include d1.spawn['url'].split( ':' ).first
-                        expect(d2.spawn['url'].split( ':' ).first).to eq(preferred)
-                        expect(%W{127.0.0.1 127.0.0.3}).to include d3.spawn['url'].split( ':' ).first
-                        expect(%W{127.0.0.2 127.0.0.3}).to include d3.spawn['url'].split( ':' ).first
-                        expect(%W{127.0.0.2 127.0.0.3}).to include d1.spawn['url'].split( ':' ).first
+                        expect(d2.spawn(strategy: :horizontal )['url'].split( ':' ).first).to eq(preferred)
+                        expect(%W{127.0.0.1 127.0.0.2}).to include d3.spawn(strategy: :horizontal )['url'].split( ':' ).first
+                        expect(%W{127.0.0.1 127.0.0.3}).to include d3.spawn(strategy: :horizontal )['url'].split( ':' ).first
+                        expect(%W{127.0.0.2 127.0.0.3}).to include d1.spawn(strategy: :horizontal )['url'].split( ':' ).first
                     end
                 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cuboid
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Tasos Laskos
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-05-19 00:00:00.000000000 Z
+date: 2023-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: awesome_print