flydata 0.5.9 → 0.5.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 66683f280e2cbf2c1c8ad081e4b9194dba9a928c
-  data.tar.gz: ff0e0497ec61502cbcb5a17d2860e3a98117cd54
+  metadata.gz: 9ae9067dda053aa56404eb3260e3518679d787cd
+  data.tar.gz: f4af787def23a4860a8bbe5ed4619e61bb8abb7e
 SHA512:
-  metadata.gz: ed0e5930aa2494cc5ffb11d026c5edca78ba03fd97c72f42293864d5a835323f3a087133dec202245e6f143074fb8e8dbde3bf05d638f1bfdcd73d0725ae0bc8
-  data.tar.gz: c770737b2a978791723d46a9a8983c1677174c83f15a86ca03db552891a2d37529913ba62cbde987837bc931ac3d715d6cbd953e523126bd6cbc3742edeef09f
+  metadata.gz: e6160a696088969741b7fb49cc44c1a7e28cf8af0d839a8fec431b8549ec9ebfc5e54cb4845bfb3ccb789585e5fd9953e75d0fc16136d443c0b251f269aa7af4
+  data.tar.gz: 6df8c0c9a3bd151d157ba2ac01e1c74757abfb1abc86cc23774b33ddebcc06331f4f7af798a49432af9a6cf0bf750363dc039d8f40f119494cdc0da102eb17ac

data/VERSION

@@ -1 +1 @@
-0.5.9
+0.5.10

data/flydata.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: flydata 0.5.9 ruby lib
+# stub: flydata 0.5.10 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "flydata"
-  s.version = "0.5.9"
+  s.version = "0.5.10"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Koichi Fujikawa", "Masashi Miyazaki", "Matthew Luu", "Mak Inada", "Sriram NS"]
-  s.date = "2015-10-02"
+  s.date = "2015-10-04"
   s.description = "FlyData Agent"
   s.email = "sysadmin@flydata.com"
   s.executables = ["fdmysqldump", "flydata", "serverinfo"]
@@ -146,6 +146,7 @@ Gem::Specification.new do |s|
     "lib/flydata/fluent-plugins/preference.rb",
     "lib/flydata/flydata_crontab.sh",
     "lib/flydata/helper/action/agent_action.rb",
+    "lib/flydata/helper/action/check_abnormal_shutdown.rb",
     "lib/flydata/helper/action/check_remote_actions.rb",
     "lib/flydata/helper/action/restart_agent.rb",
     "lib/flydata/helper/action/send_logs.rb",
@@ -207,6 +208,7 @@ Gem::Specification.new do |s|
     "spec/flydata/fluent-plugins/mysql/shared_query_handler_context.rb",
     "spec/flydata/fluent-plugins/mysql/table_meta_spec.rb",
     "spec/flydata/fluent-plugins/mysql/truncate_query_handler_spec.rb",
+    "spec/flydata/helper/action/check_abnormal_shutdown_spec.rb",
     "spec/flydata/helper/action/check_remote_actions_spec.rb",
     "spec/flydata/helper/action/restart_agent_spec.rb",
     "spec/flydata/helper/action/send_logs_spec.rb",

data/lib/flydata/command/helper.rb

@@ -66,12 +66,19 @@ module Flydata
       def restart(options = {})
         if running?
           log_info_stdout("Restarting Helper.", {}, options)
-          run_command(kill_hup_cmd)
-        else
-          raw_start
+          run_command(stop_cmd)
         end
+        raw_start
       end
 
+       def reload(options = {})
+         if running?
+           log_info_stdout("Reloading Helper.", {}, options)
+           run_command(kill_hup_cmd)
+         end
+       end
+
+
       private
 
       def create_config_with_args

data/lib/flydata/command/setup.rb

@@ -2,6 +2,7 @@ require 'flydata/command/base'
 require 'flydata/command/conf'
 require 'flydata/command/login'
 require 'flydata/command/sender'
+require 'flydata/command/helper'
 require 'flydata/helpers'
 require 'flydata/sync_file_manager'
 
@@ -89,6 +90,10 @@ What's next?
         redshift_console_url = "#{flydata.flydata_api_host}/redshift_clusters/query/new"
         last_message = ALL_DONE_MESSAGE_TEMPLATE % [redshift_console_url, dashboard_url]
 
+        # Surprisingly, Helper's start method kills the process after starting
+        # the helper thanks to ServerEngine.  So the command needs to run in a
+        # separate process.
+        fork { Flydata::Command::Helper.new.restart(quiet: true) }
         run(quiet: true) do
           Flydata::Command::Conf.new.copy_templates
           puts

data/lib/flydata/helper/action/agent_action.rb

@@ -12,7 +12,7 @@ module Flydata
           log_debug("Executing #{cmd}")
           o, e, s = Util::Shell.run_cmd(cmd)
           log_error(e) if not e.to_s.empty?
-          log.error("Could not execute #{cmd}. Response status : #{s}") unless (s.to_i == 0)
+          log_error("Could not execute #{cmd}. Response status : #{s}") unless (s.to_i == 0)
         end
 
         # Override this. Needs to be implemented by the subclass

data/lib/flydata/helper/action/check_abnormal_shutdown.rb

@@ -0,0 +1,29 @@
+require 'flydata'
+require 'flydata/helper/base_action'
+
+module Flydata
+  module Helper
+    module Action
+      class CheckAbnormalShutdown < BaseAction
+        def execute(opts = {})
+          if abnormal_shutdown_occurred?
+            log_info "Abnormal shutdown occurred.  Restart the agent."
+            yield :restart_agent, nil
+          end
+        end
+
+        private
+        def abnormal_shutdown_occurred?
+          File.exists?(FLYDATA_LOCK) && !process_exists?(File.open(FLYDATA_LOCK){|f| f.read})
+        end
+
+        def process_exists?(pid)
+          Process.getpgid(pid.to_i)
+          true
+        rescue Errno::ESRCH
+          false
+        end
+      end
+    end
+  end
+end

data/lib/flydata/helper/action_ownership.rb

@@ -43,6 +43,7 @@ module Flydata
       def self.action_ownership_map
         [
           self.new(:check_remote_actions, false, Action::CheckRemoteActions),
+          self.new(:check_abnormal_shutdown, false, Action::CheckAbnormalShutdown),
           self.new(:send_logs, false, Action::SendLogs),
           self.new(:stop_agent, true, Action::StopAgent),
           self.new(:restart_agent, true, Action::RestartAgent)

data/lib/flydata/helper/config_parser.rb

@@ -24,6 +24,9 @@ module Flydata
         check_remote_actions: {
           check_interval: '30s',
         },
+        check_abnormal_shutdown: {
+          check_interval: '60s',
+        },
       }
       DEFAULT_HELPER = {
         scheduled_actions: DEFAULT_SCHEDULED_ACTIONS,

data/spec/flydata/command/helper_spec.rb

@@ -10,7 +10,7 @@ module Flydata
 
       PROCESS_REGEX = /^\[ -f .*helper.pid \] \&\& pgrep -P `cat .*helper.pid`$/
       STOP_REGEX = /kill  `cat .*helper.pid`\n/
-      RESTART_REGEX = /kill -HUP `cat .*helper.pid`/
+      RELOAD_REGEX = /kill -HUP `cat .*helper.pid`/
 
       shared_examples "test start command" do
         context "when the Helper process is not running" do
@@ -82,11 +82,12 @@ module Flydata
       describe "#restart" do
         subject { helper.restart }
         context "when the Helper process is running" do
-          it "sends the KILL -HUP to the process to reload config" do
+          it "stops and starts the process" do
             expect(helper).to receive(:'`').with(PROCESS_REGEX).and_return("1")
             expect(Open3).to receive(:capture3) do |env, cmd|
-              expect(cmd).to match(RESTART_REGEX)
+              expect(cmd).to match(STOP_REGEX)
             end
+            expect(Flydata::Helper::Server).to receive(:run)
             subject
           end
         end
@@ -99,6 +100,19 @@ module Flydata
         end
       end
 
+      describe '#reload' do
+        subject { helper.reload }
+        context "when the Helper process is running" do
+          it "sends the KILL -HUP to the process to reload config" do
+            expect(helper).to receive(:'`').with(PROCESS_REGEX).and_return("1")
+            expect(Open3).to receive(:capture3) do |env, cmd|
+              expect(cmd).to match(RELOAD_REGEX)
+            end
+            subject
+          end
+        end
+      end
+
       describe "#status" do
         subject { helper.status }
         context "when the Helper process is running" do

data/spec/flydata/helper/action/check_abnormal_shutdown_spec.rb

@@ -0,0 +1,12 @@
+require 'spec_helper'
+require 'flydata/helper/action/check_abnormal_shutdown'
+require_relative '../helper_shared_context'
+
+module Flydata
+  module Helper
+    module Action
+      describe CheckRemoteActions do
+      end
+    end
+  end
+end

data/spec/flydata/helper/action_ownership_spec.rb

@@ -36,8 +36,9 @@ module Flydata
       describe '.action_ownership_map' do
         subject { described_class.action_ownership_map }
         it do
-          expect(subject.size).to eq(4)
+          expect(subject.size).to eq(5)
           expect(subject.include?(:check_remote_actions)).to be(true)
+          expect(subject.include?(:check_abnormal_shutdown)).to be(true)
           expect(subject.include?(:send_logs)).to be(true)
           expect(subject.include?(:stop_agent)).to be(true)
           expect(subject.include?(:restart_agent)).to be(true)

data/spec/flydata/helper/config_parser_spec.rb

@@ -33,6 +33,11 @@ module Flydata
               {
                 check_interval: 30,
                 name: :check_remote_actions
+              },
+            check_abnormal_shutdown:
+              {
+                check_interval: 60,
+                name: :check_abnormal_shutdown
               }
           })
         end
@@ -65,6 +70,9 @@ module Flydata
                 scheduled_actions: {
                   check_remote_actions: {
                     check_interval: '30s'
+                  },
+                  check_abnormal_shutdown: {
+                    check_interval: '60s'
                   }
                 }
               }
@@ -87,6 +95,9 @@ EOT
                 scheduled_actions: {
                   check_remote_actions: {
                     check_interval: '1m'
+                  },
+                  check_abnormal_shutdown: {
+                    check_interval: '60s'
                   }
                 }
               }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flydata
 version: !ruby/object:Gem::Version
-  version: 0.5.9
+  version: 0.5.10
 platform: ruby
 authors:
 - Koichi Fujikawa
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-02 00:00:00.000000000 Z
+date: 2015-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -583,6 +583,7 @@ files:
 - lib/flydata/fluent-plugins/preference.rb
 - lib/flydata/flydata_crontab.sh
 - lib/flydata/helper/action/agent_action.rb
+- lib/flydata/helper/action/check_abnormal_shutdown.rb
 - lib/flydata/helper/action/check_remote_actions.rb
 - lib/flydata/helper/action/restart_agent.rb
 - lib/flydata/helper/action/send_logs.rb
@@ -644,6 +645,7 @@ files:
 - spec/flydata/fluent-plugins/mysql/shared_query_handler_context.rb
 - spec/flydata/fluent-plugins/mysql/table_meta_spec.rb
 - spec/flydata/fluent-plugins/mysql/truncate_query_handler_spec.rb
+- spec/flydata/helper/action/check_abnormal_shutdown_spec.rb
 - spec/flydata/helper/action/check_remote_actions_spec.rb
 - spec/flydata/helper/action/restart_agent_spec.rb
 - spec/flydata/helper/action/send_logs_spec.rb