bayserver-core 2.2.2 → 2.3.1

data/lib/baykit/bayserver/docker/warp/warp_data.rb

@@ -38,6 +38,12 @@ module Baykit
               end
 
               tur_id = tur.id()
+
+              if !@started
+                # The buffer will become corrupted due to reuse.
+                buf = buf.dup()
+              end
+
               @warp_ship.warp_handler.post_warp_contents(
                 tur,
                 buf,
@@ -51,6 +57,7 @@ module Baykit
 
           def on_end_content(tur)
             BayLog.debug("%s End req content tur=%s", @warp_ship, tur)
+            @warp_ship.check_ship_id(@warp_ship_id)
             @warp_ship.warp_handler.post_warp_end(tur)
           end
 
@@ -66,6 +73,7 @@ module Baykit
             if !@started
               @warp_ship.protocol_handler.command_packer.flush(@warp_ship)
               BayLog.debug("%s Start Warp tour", self)
+              @warp_ship.flush()
               @started = true
             end
           end

data/lib/baykit/bayserver/docker/warp/warp_data_listener.rb

@@ -66,17 +66,17 @@ module Baykit
               tur = pair[1]
               tur.check_tour_id pair[0]
 
-              if !tur.res.header_sent
-                BayLog.error("%s Send ServiceUnavailable: tur=%s", self, tur);
-                tur.res.send_error(Tour::TOUR_ID_NOCHECK, HttpStatus::SERVICE_UNAVAILABLE, "Server closed on reading headers")
-              else
-                # NOT treat EOF as Error
-                BayLog.debug("%s EOF is not an error: tur=%s", self, tur);
-                begin
+              begin
+                if !tur.res.header_sent
+                  BayLog.debug("%s Send ServiceUnavailable: tur=%s", self, tur)
+                  tur.res.send_error(Tour::TOUR_ID_NOCHECK, HttpStatus::SERVICE_UNAVAILABLE, "Server closed on reading headers")
+                else
+                  # NOT treat EOF as Error
+                  BayLog.debug("%s EOF is not an error: tur=%s", self, tur)
                   tur.res.end_content(Tour::TOUR_ID_NOCHECK)
-                rescue IOError => e
-                  BayLog::debug_e(e, "%s end content error: tur=%s", self, tur);
                 end
+              rescue IOError => e
+                BayLog::debug_e(e)
               end
             end
 

data/lib/baykit/bayserver/docker/warp/warp_docker.rb

@@ -1,6 +1,7 @@
 require 'uri'
 
 require 'baykit/bayserver/agent/grand_agent'
+require 'baykit/bayserver/agent/lifecycle_listener'
 require 'baykit/bayserver/docker/base/club_base'
 require 'baykit/bayserver/docker/warp/warp_data'
 require 'baykit/bayserver/docker/warp/warp_data_listener'
@@ -19,7 +20,7 @@ module Baykit
           include Baykit::BayServer::Docker::Warp
 
           class AgentListener
-            include Baykit::BayServer::Agent::GrandAgent::GrandAgentLifecycleListener
+            include Baykit::BayServer::Agent::LifecycleListener
 
             attr :warp_docker
 

data/lib/baykit/bayserver/docker/warp/warp_ship.rb

@@ -18,7 +18,7 @@ module Baykit
           attr_accessor :connected
           attr :socket_timeout_sec
           attr :lock
-
+          attr :cmd_buf
 
           def initialize()
             super
@@ -27,12 +27,17 @@ module Baykit
             @tour_map = {}
             @lock = Mutex.new()
             @connected = false
+            @cmd_buf = []
           end
 
           def to_s()
             return "warp##{@ship_id}/#{@object_id}[#{protocol}]"
           end
 
+          def inspect
+            to_s
+          end
+
           ######################################################
           # Implements Reusable
           ######################################################
@@ -43,6 +48,8 @@ module Baykit
               BayLog.error("BUG: Some tours is active: %s", @tour_map)
             end
             @connected = false
+            @tour_map = {}
+            @cmd_buf = []
           end
 
 
@@ -129,6 +136,8 @@ module Baykit
                   rescue Exception => e
                     BayLog.error_e(e)
                   end
+                else
+                  tur.res.end_content(Tour::TOUR_ID_NOCHECK)
                 end
               end
               @tour_map.clear
@@ -161,8 +170,28 @@ module Baykit
             return timeout
           end
 
-          def inspect
-            to_s
+          def post(cmd, listener=nil)
+            if !@connected
+              @cmd_buf << [cmd, listener]
+            else
+              if cmd == nil
+                listener.call()
+              else
+                @protocol_handler.command_packer.post(self, cmd, &listener)
+              end
+            end
+          end
+          def flush()
+              @cmd_buf.each do | cmd_and_lis |
+                cmd = cmd_and_lis[0]
+                lis = cmd_and_lis[1]
+                if cmd == nil
+                  lis.call()
+                else
+                  @protocol_handler.command_packer.post(self, cmd, &lis)
+                end
+              end
+              @cmd_buf = []
           end
         end
       end

data/lib/baykit/bayserver/mem_usage.rb

@@ -1,5 +1,6 @@
 require 'baykit/bayserver/bayserver'
 require 'baykit/bayserver/agent/grand_agent'
+require 'baykit/bayserver/agent/lifecycle_listener'
 require 'baykit/bayserver/protocol/protocol_handler_store'
 require 'baykit/bayserver/protocol/packet_store'
 require 'baykit/bayserver/tours/tour_store'
@@ -20,7 +21,7 @@ module Baykit
       include Baykit::BayServer::Util
 
       class AgentListener
-        include Baykit::BayServer::Agent::GrandAgent::GrandAgentLifecycleListener
+        include Baykit::BayServer::Agent::LifecycleListener
 
         def add(agt)
           MemUsage.mem_usages[agt.agent_id] = MemUsage.new(agt.agent_id);

data/lib/baykit/bayserver/protocol/packet_store.rb

@@ -1,4 +1,5 @@
 require 'baykit/bayserver/agent/grand_agent'
+require 'baykit/bayserver/agent/lifecycle_listener'
 require 'baykit/bayserver/util/object_store'
 require 'baykit/bayserver/protocol/packet_factory'
 
@@ -12,7 +13,7 @@ module Baykit
         include Baykit::BayServer::Util
 
         class AgentListener
-          include Baykit::BayServer::Agent::GrandAgent::GrandAgentLifecycleListener # implements
+          include Baykit::BayServer::Agent::LifecycleListener # implements
 
           def add(agt)
             PacketStore.proto_map.values().each do |ifo|

data/lib/baykit/bayserver/protocol/protocol_handler_store.rb

@@ -1,4 +1,5 @@
 require 'baykit/bayserver/agent/grand_agent'
+require 'baykit/bayserver/agent/lifecycle_listener'
 require 'baykit/bayserver/util/object_store'
 require 'baykit/bayserver/util/string_util'
 
@@ -10,7 +11,7 @@ module Baykit
         include Baykit::BayServer::Util
 
         class AgentListener
-          include Baykit::BayServer::Agent::GrandAgent::GrandAgentLifecycleListener # implements
+          include Baykit::BayServer::Agent::LifecycleListener # implements
 
           def add(agt)
             ProtocolHandlerStore.proto_map.values().each {|ifo| ifo.add_agent(agt) }

data/lib/baykit/bayserver/taxi/taxi.rb

@@ -8,6 +8,7 @@ module Baykit
         # abstract method
         #
         # depart()
+        # on_timer()
         #
 
         class << self

data/lib/baykit/bayserver/taxi/taxi_runner.rb

@@ -1,23 +1,112 @@
+require 'baykit/bayserver/bayserver'
+require 'baykit/bayserver/agent/grand_agent'
+require 'baykit/bayserver/agent/lifecycle_listener'
 require 'baykit/bayserver/util/executor_service'
+require 'baykit/bayserver/sink'
 
 module Baykit
   module BayServer
     module Taxi
       class TaxiRunner
+        include Baykit::BayServer
+        include Baykit::BayServer::Agent
         include Baykit::BayServer::Util
 
+        class AgentListener
+          include Baykit::BayServer::Agent::LifecycleListener # implements
+
+          def add(agt)
+            TaxiRunner.runners[agt.agent_id - 1] = TaxiRunner.new(agt)
+          end
+
+          def remove(agt)
+            TaxiRunner.runners[agt.agent_id - 1].terminate()
+            TaxiRunner.runners[agt.agent_id - 1] = nil
+          end
+        end
+
+
         # define class instance accessor
         class << self
-          attr :exe
+          attr :max_taxis
+          attr :runners
+        end
+
+        attr :agent
+        attr :exe
+        attr :running_taxis
+        attr :lock
+
+        def initialize(agt)
+          @agent = agt
+          @exe = ExecutorService.new("TaxiRunner", TaxiRunner.max_taxis)
+          @agent.add_timer_handler(self)
+          @running_taxis = []
+          @lock = Monitor.new()
+        end
+
+        ######################################################
+        # Implements TimerHandler
+        ######################################################
+
+        def on_timer()
+          @lock.synchronize do
+            @running_taxis.each do |txi|
+              txi.on_timer()
+            end
+          end
+        end
+
+        ######################################################
+        # Custom methods
+        ######################################################
+
+        def terminate()
+          @agent.remove_timer_handler(self)
+          @exe.shutdown
+        end
+
+        def submit(txi)
+          @exe.submit() do
+            if @agent.aborted
+              BayLog.error("Agent is aborted")
+              return
+            end
+
+            @lock.synchronize do
+              @running_taxis << txi
+            end
+
+            begin
+              txi.run()
+            rescue => e
+              BayLog.fatal_e(e)
+              @agent.req_shutdown
+            ensure
+              @lock.synchronize do
+                @running_taxis.delete(txi)
+              end
+            end
+          end
         end
 
-        def TaxiRunner.init(num_agents)
-          @exe = ExecutorService.new("TaxiRunner", num_agents)
+        ######################################################
+        # Class methods
+        ######################################################
+
+        def TaxiRunner.init(max_taxis)
+          if(max_taxis <= 0)
+            raise Sink.new()
+          end
+          @max_taxis = max_taxis
+          @runners = []
+          GrandAgent.add_lifecycle_listener(AgentListener.new())
         end
 
-        def TaxiRunner.post(taxi)
+        def TaxiRunner.post(agt_id, txi)
+          BayLog.debug("agt#%d post taxi: thread=%s taxi=%s", agt_id, Thread.current.name, txi);
           begin
-            @exe.submit(taxi)
+            @runners[agt_id - 1].submit(txi)
             return true
           rescue => e
             BayLog.error_e(e)

data/lib/baykit/bayserver/tours/read_file_taxi.rb

@@ -23,12 +23,15 @@ module Baykit
         attr :buf_size
         attr :running
         attr :lock
+        attr :agent_id
+        attr :start_time
 
-        def initialize(buf_size)
+        def initialize(agt_id, buf_size)
           super()
           @buf_size = buf_size
           @buf = StringUtil.alloc(buf_size)
           @lock = Monitor.new()
+          @agent_id = agt_id
         end
 
         def to_s()
@@ -56,28 +59,36 @@ module Baykit
         ######################################################
 
         def depart()
-          @lock.synchronize do
-            begin
-              @buf.clear()
-              @infile.read(@buf_size, @buf)
-
-              if @buf.length == 0
-                @data_listener.notify_eof()
-                close()
-                return
-              end
+          @start_time = Time.now.to_i
+          begin
+            @buf.clear()
+            @infile.read(@buf_size, @buf)
 
-              act = @data_listener.notify_read(@buf, nil)
+            if @buf.length == 0
+              close()
+              return
+            end
 
-              @running = false
-              if act == NextSocketAction::CONTINUE
-                next_run()
-              end
+            act = @data_listener.notify_read(@buf, nil)
 
-            rescue Exception => e
-              BayLog.error_e(e)
-              close()
+            @running = false
+            if act == NextSocketAction::CONTINUE
+              next_run()
             end
+
+          rescue IOError => e
+            BayLog.debug_e(e)
+            close()
+          rescue Exception => e
+            close()
+            raise e
+          end
+        end
+
+        def on_timer()
+          duration_sec = Time.now.to_i - @start_time
+          if (@data_listener.check_timeout(duration_sec))
+            close()
           end
         end
 
@@ -88,13 +99,25 @@ module Baykit
             return
           end
           @running = true
-          TaxiRunner.post(self)
+          TaxiRunner.post(@agent_id, self)
         end
 
         def close()
-          @ch_valid = false
-          @infile.close()
-          @data_listener.notify_close()
+          @lock.synchronize do
+            if !@ch_valid
+              return
+            end
+
+            @ch_valid = false
+            @data_listener.notify_eof()
+
+            begin
+              @infile.close()
+            rescue IOError => e
+            end
+
+            @data_listener.notify_close()
+          end
         end
       end
     end

data/lib/baykit/bayserver/tours/send_file_yacht.rb

@@ -57,7 +57,11 @@ module Baykit
 
         def notify_eof()
           BayLog.trace("%s EOF(^o^) %s", self, @file_name)
-          @tour.res.end_content(@tour_id)
+          begin
+            @tour.res.end_content(@tour_id)
+          rescue IOError => e
+            BayLog.debug_e(e)
+          end
           return NextSocketAction::CLOSE
         end
 

data/lib/baykit/bayserver/tours/tour.rb

@@ -123,14 +123,9 @@ module Baykit
           else
             begin
               city.enter(self)
-            rescue Sink => e
-              raise e
             rescue HttpException => e
-              BayLog.error_e(e)
+              change_state(TOUR_ID_NOCHECK, TourState::ABORTED)
               raise e
-            rescue => e
-              BayLog.error_e(e)
-              raise HttpException.new(HttpStatus::INTERNAL_SERVER_ERROR, e.message)
             end
           end
         end
@@ -155,6 +150,10 @@ module Baykit
           return @state == TourState::ABORTED
         end
 
+        def ended?()
+          return @state == TourState::ENDED
+        end
+
         def initialized?()
           return state != TourState::UNINITIALIZED
         end

data/lib/baykit/bayserver/tours/tour_req.rb

@@ -125,34 +125,33 @@ module Baykit
         def post_content(check_id, data, start, len)
           @tour.check_tour_id(check_id)
 
+          data_passed = false
           if !@tour.running?
             BayLog.debug("%s tour is not running.", @tour)
-            return true
-          end
 
-          if @content_handler == nil
+          elsif @content_handler == nil
             BayLog.warn("%s content read, but no content handler", tour)
-            return true
-          end
 
-          if @consume_listener == nil
+          elsif @consume_listener == nil
             raise Sink.new("Request consume listener is null")
-          end
 
-          if @bytes_posted + len > @bytes_limit
+          elsif @bytes_posted + len > @bytes_limit
             raise ProtocolException.new("Read data exceed content-length: %d/%d", @bytes_posted + len, @bytes_limit)
-          end
 
-          # If has error, only read content. (Do not call content handler)
-          if @tour.error == nil
+          elsif  @tour.error != nil
+            # If has error, only read content. (Do not call content handler)
+            BayLog.debug("%s tour has error.", @tour)
+
+          else
             @content_handler.on_read_content(@tour, data, start, len)
+            data_passed = true
           end
-          @bytes_posted += len
 
+          @bytes_posted += len
           BayLog.debug("%s read content: len=%d posted=%d limit=%d consumed=%d",
                        @tour, len, @bytes_posted, @bytes_limit, @bytes_consumed)
 
-          if @tour.error == nil
+          if !data_passed
             return true
           end
 
@@ -209,26 +208,27 @@ module Baykit
         end
 
         def abort()
-          if !@tour.preparing?
-            BayLog.debug("%s cannot abort non-preparing tour", @tour)
-            return false
-          end
-
           BayLog.debug("%s abort", @tour)
-          if @tour.aborted?
-            raise Sink.new("tour has already aborted")
-          end
+          if @tour.preparing?
+            @tour.change_state(Tour::TOUR_ID_NOCHECK, Tour::TourState::ABORTED)
+            return true
 
-          aborted = true
-          if @tour.running? && @content_handler != nil
-            aborted = @content_handler.on_abort(@tour)
-          end
+          elsif @tour.running?
+            aborted = true
+            if @content_handler != nil
+              aborted = @content_handler.on_abort(@tour)
+            end
 
-          if aborted
-            @tour.change_state(Tour::TOUR_ID_NOCHECK, Tour::TourState::ABORTED)
+            if aborted
+              @tour.change_state(Tour::TOUR_ID_NOCHECK, Tour::TourState::ABORTED)
+            end
+
+            return aborted
+          else
+            BayLog.debug("%s tour is not preparing or not running", @tour)
+            return false
           end
 
-          return aborted
         end
 
         def set_content_handler(hnd)