bayserver-core 2.3.2 → 3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ef1870c148ef4f045575bdd31e28b5e13808013fa159e0642a627471e0b80962
-  data.tar.gz: 0247c5d8b92f4c9f1cf95b20ae02687202d524c6edd82158711bce98fa5e8e6e
+  metadata.gz: fbe7b085db08c0c14d26ea84e167218110e22e8907fd736aadefb15510141b39
+  data.tar.gz: 91cd0fcc14b62444677caf841fbefee54eec8037e27da5c9feee1cd7048e8071
 SHA512:
-  metadata.gz: c3460ae4f7b5d50945fb20e5f6072838fe7277ccf6d6b9f0cd9d8e51e4ecd3c87a729121cc1d502edb8ddb120841e99377a63ba62324515a74de06d27fe769b6
-  data.tar.gz: 22d1f706b151704256cf55526e8b4bc6d29a04c2ab543c9803cb32316719239140997390d7b88b500e1d248cc8281821e68666ba68f2abdddd247880a2dbc698
+  metadata.gz: fc5aa1296c8bc2b7f81ddc8cc9dad21f8ebb8c57024e72475a6ef1a0230fdcaf351135dad2c3e7bb05d687f71837e044a370ea5633738562a57e95b81eb46e95
+  data.tar.gz: 73d2bc985423266e152eebc168cae10978f292cc05e9c958787b393c6bc1b67995804400d62189ebbeec38faf4e3bfcca18a62b0de61355cbb44b149a2b56ec6

data/lib/baykit/bayserver/agent/accept_handler.rb

@@ -23,32 +23,6 @@ module Baykit
           end
 
           def on_acceptable(server_skt)
-            port_dkr = @port_map[server_skt]
-
-            begin
-              client_skt, = server_skt.accept_nonblock
-            rescue IO::WaitReadable
-              # Maybe another agent get socket
-              BayLog.debug("Accept failed (must wait readable)")
-              return
-            end
-
-            BayLog.debug("Accepted: skt=%d", client_skt.fileno)
-
-            begin
-              port_dkr.check_admitted(client_skt)
-            rescue => e
-              BayLog.error_e(e)
-              client_skt.close()
-              return
-            end
-
-            client_skt.fcntl(Fcntl::F_SETFL, Fcntl::O_NONBLOCK)
-
-            tp = port_dkr.new_transporter(@agent, client_skt)
-            @agent.non_blocking_handler.ask_to_start(client_skt)
-            @agent.non_blocking_handler.ask_to_read(client_skt)
-            @ch_count += 1
           end
 
           def on_closed()

data/lib/baykit/bayserver/agent/channel_listener.rb

@@ -5,27 +5,27 @@ module Baykit
       module ChannelListener # interface
 
         def on_readable(chk_ch)
-          raise NotImplementedError()
+          raise NotImplementedError.new
         end
 
         def on_writable(chk_ch)
-          raise NotImplementedError()
+          raise NotImplementedError.new
         end
 
         def on_connectable(chk_ch)
-          raise NotImplementedError()
+          raise NotImplementedError.new
         end
 
         def on_error(chk_ch, e)
-          raise NotImplementedError()
+          raise NotImplementedError.new
         end
 
         def on_closed(chk_ch)
-          raise NotImplementedError()
+          raise NotImplementedError.new
         end
 
         def check_timeout(chk_ch, duration)
-          raise NotImplementedError()
+          raise NotImplementedError.new
         end
 
       end

data/lib/baykit/bayserver/agent/command_receiver.rb

@@ -1,5 +1,6 @@
 
-
+require 'baykit/bayserver/agent/monitor/grand_agent_monitor'
+require 'baykit/bayserver/ships/ship'
 
 module Baykit
   module BayServer
@@ -7,66 +8,124 @@ module Baykit
       #
       # CommandReceiver receives commands from GrandAgentMonitor
       #
-      class CommandReceiver
+      class CommandReceiver < Baykit::BayServer::Ships::Ship
+
+        include Baykit::BayServer
+        include Baykit::BayServer::Agent::Monitor
         include Baykit::BayServer::Util
-        attr :agent
-        attr :communication_channel
-        attr :aborted
-
-        def initialize(agent, com_ch)
-          @agent = agent
-          @communication_channel = com_ch
-          @aborted = false
+
+
+        def init(agt_id, rd, tp)
+          super
         end
 
         def to_s()
-          return "ComReceiver##{@agent.agent_id}"
+          return "ComReceiver##{@agent_id}"
+        end
+
+        #########################################
+        # Implements Ship
+        #########################################
+        def notify_handshake_done(proto)
+          raise Sink.new
+        end
+
+        def notify_connect
+          raise Sink.new
+        end
+
+        def notify_read(buf)
+          BayLog.debug("%s notify_read", self)
+          cmd = GrandAgentMonitor.buffer_to_int(buf)
+          on_read_command(cmd)
+          return NextSocketAction::CONTINUE
+        end
+
+        def notify_eof
+          BayLog.debug("%s notify_eof", self)
+          return NextSocketAction::CLOSE
+        end
+
+        def notify_error(e)
+          BayLog.error_e(e)
+        end
+
+        def notify_protocol_error(e)
+          raise Sink.new
         end
 
-        def on_pipe_readable()
-          cmd = IOUtil.read_int32(@communication_channel)
-          if cmd == nil
-            BayLog.debug("%s pipe closed: %d", self, @communication_channel)
-            @agent.abort_agent()
-          else
-            BayLog.debug("%s receive command %d pipe=%d", self, cmd, @communication_channel)
-            begin
+        def notify_close
+        end
+
+        def check_timeout(duration_sec)
+          return false
+        end
+
+        #########################################
+        # Custom methods
+        #########################################
+        def on_read_command(cmd)
+          agt = GrandAgent.get(@agent_id)
+
+          BayLog.debug("%s receive command %d rd=%s", self, cmd, @rudder)
+          begin
+            if cmd == nil
+              BayLog.debug("%s pipe closed", self)
+              agt.abort_agent
+            else
               case cmd
               when GrandAgent::CMD_RELOAD_CERT
-                @agent.reload_cert()
+                agt.reload_cert
               when GrandAgent::CMD_MEM_USAGE
-                @agent.print_usage()
+                agt.print_usage
               when GrandAgent::CMD_SHUTDOWN
-                @agent.req_shutdown()
-                @aborted = true
+                agt.req_shutdown
               when GrandAgent::CMD_ABORT
-                IOUtil.write_int32(@communication_channel, GrandAgent::CMD_OK)
-                @agent.abort_agent()
+                send_command_to_monitor(agt, GrandAgent::CMD_OK, true)
+                agt.abort_agent
+                return
+              when GrandAgent::CMD_CATCHUP
+                agt.catch_up
                 return
               else
                 BayLog.error("Unknown command: %d", cmd)
               end
-              IOUtil.write_int32(@communication_channel, GrandAgent::CMD_OK)
-            rescue IOError => e
-              BayLog.debug("%s Read failed (maybe agent shut down): %s", self, e)
-            ensure
-              BayLog.debug("%s Command ended", self)
+
+              send_command_to_monitor(agt, GrandAgent::CMD_OK, false)
             end
+          rescue IOError => e
+            BayLog.error_e(e, "%s Command thread aborted(end)", self)
+            close
+          ensure
+            BayLog.debug("%s Command ended", self)
           end
         end
 
-        def end()
-          BayLog.debug("%s end", self)
+        def send_command_to_monitor(agt, cmd, sync)
+          buf = GrandAgentMonitor.int_to_buffer(cmd)
+          if sync
+
+          end
+        end
+
+        def end
+          BayLog.debug("%s send end to monitor", self)
           begin
-            IOUtil.write_int32(@communication_channel, GrandAgent::CMD_CLOSE)
-          rescue => e
-            BayLog.error_e(e, "%s Write error", @agent);
+            send_command_to_monitor(nil, GrandAgent::CMD_CLOSE, true)
+          rescue IOError => e
+            BayLog.error_e(e)
           end
-          close()
+
+          close
         end
 
-        def close()
-          @communication_channel.close()
+        def close
+          if @closed
+            return
+          end
+
+          @rudder.close
+          @closed = true
         end
 
       end