syncwrap 2.7.1 → 2.8.0

data/lib/syncwrap/systemd_service.rb

@@ -0,0 +1,140 @@
+#--
+# Copyright (c) 2011-2016 David Kellum
+#
+# Licensed under the Apache License, Version 2.0 (the "License"); you
+# may not use this file except in compliance with the License.  You may
+# obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+# implied.  See the License for the specific language governing
+# permissions and limitations under the License.
+#++
+
+module SyncWrap
+
+  # Support module for components which install SystemD
+  # services. Provide unit file installation with `systemctl` calls,
+  # and also provides standard #start, #restart, #stop, and #status
+  # commands for use in the CLI.
+  #
+  # Host component dependencies: <Distro>
+  module SystemDService
+
+    protected
+
+    # The name of a systemd service unit file to create/rput. The name
+    # should include a ".service" suffix. Will rput the same name (or
+    # .erb extended template) under :sync_paths /etc/systemd/system.
+    # (Required for use of public interface)
+    attr_accessor :systemd_service
+
+    # The name of the systemd socket unit file to create/rput for
+    # socket activation. If specified, the name should include a
+    # ".socket" suffix. Will rput the same name (or .erb extended
+    # template) under :sync_paths /etc/systemd/system.
+    attr_accessor :systemd_socket
+
+    # An array of ListenStream configuration values for #systemd_socket
+    # (Default: nil -> unspecified and will raise if accessed)
+    attr_writer :listen_streams
+
+    def listen_streams
+      @listen_streams or raise "#{self.class.name}#listen_streams not specified"
+    end
+
+    def initialize( opts = {} )
+      @systemd_service = nil
+      @systemd_socket = nil
+      @listen_streams = nil
+      super
+    end
+
+    public
+
+    # Install the systemd units files by #rput_unit_files, detecting
+    # changes and performs `systemctl` daemon-reload, (re-)enable, and
+    # #restart or #start as required. If restart_required evaluates to
+    # true, for example given other external changes, a #restart is
+    # mandated.
+    def install_units( restart_required = false )
+      require_systemd_service!
+      units_d = rput_unit_files
+
+      sock_d = systemd_socket &&
+               units_d.find { |_,f| File.basename( f ) == systemd_socket }
+
+      if !units_d.empty?
+        systemctl( 'daemon-reload' )
+        systemctl( 'reenable', *systemd_units )
+      end
+
+      if ( restart_required || !units_d.empty? )
+        restart( with_socket: !!sock_d )
+      else
+        start
+      end
+
+      units_d
+    end
+
+    # Start all #systemd_units.
+    def start
+      require_systemd_service!
+      systemctl( 'start', *systemd_units )
+    end
+
+    # Restart the service. If option :with_socket is passed as true,
+    # restart all #systemd_units which includes #systemd_socket if
+    # present.
+    def restart( opts = {} )
+      require_systemd_service!
+      if opts[ :with_socket ]
+        systemctl( 'restart', *systemd_units )
+      else
+        systemctl( 'restart', systemd_service )
+      end
+    end
+
+    # Stop all #systemd_units.
+    def stop
+      require_systemd_service!
+      systemctl( 'stop', *systemd_units )
+    end
+
+    # Output status of #systemd_units (useful via CLI with --verbose)
+    def status
+      require_systemd_service!
+      systemctl( 'status', *systemd_units )
+    end
+
+    protected
+
+    # Perform rput of systemd unit files and return changes
+    # array. This can be overridden, for example to use system
+    # provided units (no-op and return `[]`) or for additional "drop-in"
+    # config files (e.g. foo.service.d/overrides.conf).  Any changes
+    # signal that the service (or if included in changes, the socket)
+    # should be restarted.
+    def rput_unit_files
+      srcs = systemd_units.map { |u| "/etc/systemd/system/" + u }
+      rput( *srcs, "/etc/systemd/system/", user: :root )
+    end
+
+    # Return Array of the unit names that were specified (not nil)
+    # via #systemd_service and #systemd_socket.
+    def systemd_units
+      [systemd_socket, systemd_service].compact
+    end
+
+    # Raise if systemd_service not specified.
+    def require_systemd_service!
+      raise "#{self.class.name}#systemd_service not set" unless systemd_service
+    end
+
+  end
+
+end

data/lib/syncwrap.rb

@@ -359,11 +359,10 @@ module SyncWrap
           opts[ :flush_component ] ? "start" : "enqueue" )
       end
 
-      comp.send( mth )
-
-      ctx.flush if opts[ :flush_component ]
+      comp.public_send( mth )
 
       if opts[ :flush_component ]
+        ctx.flush
         formatter.sync do
           formatter.write_component( host, comp, mth, "complete" )
         end
@@ -423,7 +422,9 @@ module SyncWrap
 
   # Additional autoloads (optional support)
   autoload :AmazonEC2,     'syncwrap/amazon_ec2'
+  autoload :ChangeKeyListener, 'syncwrap/change_key_listener'
   autoload :GitHelp,       'syncwrap/git_help'
+  autoload :SystemDService, 'syncwrap/systemd_service'
   autoload :UserData,      'syncwrap/user_data'
   autoload :ZoneBalancer,  'syncwrap/zone_balancer'
 

data/sync/etc/systemd/system/puma.service.erb

@@ -1,6 +1,9 @@
 [Unit]
 Description=Puma HTTP Server
 After=network.target
+<% if systemd_socket %>
+Requires=<%= systemd_socket %>
+<% end %>
 
 [Service]
 Type=simple

data/sync/etc/systemd/system/puma.socket.erb

@@ -0,0 +1,15 @@
+[Unit]
+Description=Puma HTTP Server Accept Sockets
+
+[Socket]
+<% listen_streams.each do |s| %>
+ListenStream=<%= s %>
+<% end %>
+
+# Socket options matching Puma defaults
+NoDelay=true
+ReusePort=true
+Backlog=1024
+
+[Install]
+WantedBy=sockets.target

data/sync/postgresql/postgresql.conf.erb

@@ -79,8 +79,6 @@ listen_addresses = '*'
                                         # defaults to 'localhost'; use '*' for all
                                         # (change requires restart)
 #port = 5432                            # (change requires restart)
-# Note: In RHEL-like installations, you can't set the port number here;
-# adjust it in the service file instead.
 max_connections = 100                   # (change requires restart)
 # Note:  Increasing max_connections costs ~400 bytes of shared memory per
 # connection slot, plus lock space (see max_locks_per_transaction).
@@ -136,6 +134,7 @@ max_connections = 100                   # (change requires restart)
 shared_buffers = <%= shared_buffers %>  # min 128kB
                                         # (change requires restart)
 #huge_pages = try                       # on, off, or try (9.4+)
+                                        # (change requires restart)
 #temp_buffers = 8MB                     # min 800kB
 #max_prepared_transactions = 0          # zero disables the feature
                                         # (change requires restart)
@@ -145,6 +144,8 @@ shared_buffers = <%= shared_buffers %>  # min 128kB
 # actively intend to use prepared transactions.
 work_mem = <%= work_mem %>              # min 64kB
 maintenance_work_mem = <%= maintenance_work_mem %> # min 1MB
+#replacement_sort_tuples = 150000       # limits use of replacement selection sort (9.6+)
+#autovacuum_work_mem = -1               # min 1MB, or -1 to use maintenance_work_mem (9.4+)
 max_stack_depth = <%= max_stack_depth %> # min 100kB
 #dynamic_shared_memory_type = posix     # the default is the first option (9.4+)
                                         # supported by the operating system:
@@ -177,13 +178,20 @@ max_stack_depth = <%= max_stack_depth %> # min 100kB
 
 #bgwriter_delay = 200ms                 # 10-10000ms between rounds
 #bgwriter_lru_maxpages = 100            # 0-1000 max buffers written/round
-#bgwriter_lru_multiplier = 2.0          # 0-10.0 multipler on buffers scanned/round
+#bgwriter_lru_multiplier = 2.0          # 0-10.0 multiplier on buffers scanned/round
+#bgwriter_flush_after = 0               # 0 disables,
+                                        # default is 512kb on linux, 0 otherwise (9.6+)
 
 # - Asynchronous Behavior -
 
 effective_io_concurrency = <%= effective_io_concurrency %>
                                         # 1-1000; 0 disables prefetching
-#max_worker_processes = 8               # (9.4+)
+#max_worker_processes = 8               # (change requires restart, 9.4+)
+#max_parallel_workers_per_gather = 2    # taken from max_worker_processes  (9.6+)
+#old_snapshot_threshold = -1            # 1min-60d; -1 disables; 0 is immediate (9.6+)
+                                        # (change requires restart)
+#backend_flush_after = 0                # 0 disables,
+                                        # default is 128kb on linux, 0 otherwise (9.6+)
 
 #------------------------------------------------------------------------------
 # WRITE AHEAD LOG
@@ -192,6 +200,7 @@ effective_io_concurrency = <%= effective_io_concurrency %>
 # - Settings -
 
 #wal_level = minimal                    # minimal, archive, hot_standby, or logical
+                                        # 9.6+: minimal, replica, or logical
                                         # (change requires restart)
 #fsync = on                             # turns forced synchronization on or off
 synchronous_commit = <%= synchronous_commit %>  # synchronization level;
@@ -210,6 +219,7 @@ synchronous_commit = <%= synchronous_commit %>  # synchronization level;
 #wal_buffers = -1                       # min 32kB, -1 sets based on shared_buffers
                                         # (change requires restart)
 #wal_writer_delay = 200ms               # 1-10000 milliseconds
+#wal_writer_flush_after = 1MB           # 0 disables (9.6+)
 
 commit_delay = <%= commit_delay %>      # range 0-100000, in microseconds
 #commit_siblings = 5                    # range 1-1000
@@ -227,6 +237,8 @@ checkpoint_segments = <%= checkpoint_segments %> # in logfile segments, min 1, 1
 <% end %>
 #checkpoint_timeout = 5min              # range 30s-1h
 #checkpoint_completion_target = 0.5     # checkpoint target duration, 0.0 - 1.0
+#checkpoint_flush_after = 0             # 0 disables,
+                                        # default is 256kb on linux, 0 otherwise
 #checkpoint_warning = 30s               # 0 disables
 
 # - Archiving -
@@ -314,7 +326,10 @@ checkpoint_segments = <%= checkpoint_segments %> # in logfile segments, min 1, 1
 #cpu_tuple_cost = 0.01                  # same scale as above
 #cpu_index_tuple_cost = 0.005           # same scale as above
 #cpu_operator_cost = 0.0025             # same scale as above
-#effective_cache_size = 4GB             # 128MB default < 9.4
+#parallel_tuple_cost = 0.1              # same scale as above (9.6+)
+#parallel_setup_cost = 1000.0           # same scale as above (9.6+)
+#min_parallel_relation_size = 8MB       # (9.6+)
+#effective_cache_size = 4GB             # (128MB was default < 9.4)
 
 # - Genetic Query Optimizer -
 
@@ -334,6 +349,7 @@ checkpoint_segments = <%= checkpoint_segments %> # in logfile segments, min 1, 1
 #from_collapse_limit = 8
 #join_collapse_limit = 8                # 1 disables collapsing of explicit
                                         # JOIN clauses
+#force_parallel_mode = off              # (9.6+)
 
 #------------------------------------------------------------------------------
 # ERROR REPORTING AND LOGGING
@@ -376,6 +392,8 @@ log_rotation_size = 0                   # Automatic rotation of logfiles will
 # These are relevant when logging to syslog:
 #syslog_facility = 'LOCAL0'
 #syslog_ident = 'postgres'
+#syslog_sequence_numbers = on           # (9.6+)
+#syslog_split_messages = on             # (9.6+)
 
 # This is only relevant when logging to eventlog (win32):
 #event_source = 'PostgreSQL'
@@ -447,6 +465,7 @@ log_line_prefix = '< %m >'              # special values:
                                         #   %p = process ID
                                         #   %t = timestamp without milliseconds
                                         #   %m = timestamp with milliseconds
+                                        #   %n = timestamp with milliseconds (Unix epoch, 9.6+)
                                         #   %i = command tag
                                         #   %e = SQL state
                                         #   %c = session ID
@@ -540,6 +559,7 @@ log_timezone = 'UTC'
 #session_replication_role = 'origin'
 #statement_timeout = 0                  # in milliseconds, 0 is disabled
 #lock_timeout = 0                       # in milliseconds, 0 is disabled
+#idle_in_transaction_session_timeout = 0 # in milliseconds, 0 is disabled
 #vacuum_freeze_min_age = 50000000
 #vacuum_freeze_table_age = 150000000
 #vacuum_multixact_freeze_min_age = 5000000

data/test/test_components.rb

@@ -23,6 +23,12 @@ require 'syncwrap'
 
 module SyncWrap
 
+  class RpmUrlInstaller < Component
+    def install
+      dist_install( "http://foo.bar/goo-3.3.4.x86_64.rpm" )
+    end
+  end
+
   # Each of the following are default auto test construction plans,
   # for all components, used below.  The last component is under test
   # and run via #install if implemented.  The prior components are
@@ -57,6 +63,11 @@ module SyncWrap
       [ RHEL, RunUser, JRubyVM, BundlerGem,
         SourceTree, { source_dir: 'lib', require_clean: false },
         Bundle, Puma, systemd_unit: 'puma.service' ],
+      [ RHEL, RunUser, JRubyVM, BundlerGem,
+        SourceTree, { source_dir: 'lib', require_clean: false },
+        Bundle, Puma, { systemd_service: 'puma.service',
+                        systemd_socket: 'puma.socket',
+                        puma_flags: { port: 5811 } } ],
       [ Debian, OpenJDK, JRubyVM, Hashdot ],
       [ RHEL,   JRubyVM, RunUser, Iyyov ],
       [ Ubuntu, JRubyVM, RunUser, Iyyov, IyyovDaemon, name: 'test', version: '0' ],
@@ -81,6 +92,7 @@ module SyncWrap
       [ RHEL, Qpid ],
       [ CentOS, QpidRepo, qpid_prebuild_repo: 'http://localhost' ],
       [ RHEL ],
+      [ RHEL, RpmUrlInstaller ],
       [ RunUser ],
       [ RHEL,  CRubyVM, TarpitGem ],
       [ RHEL,  JRubyVM, TarpitGem ],
@@ -122,12 +134,12 @@ module SyncWrap
     # Don't run rsync. Return some or no changes at random.
     def rsync( srcs, target, opts )
       @commands << rsync_args( host, srcs, target, opts )
-      ( rand(2) == 1 ) ? [ :something ] : []
+      ( rand(2) == 1 ) ? [ [ 'something', 'somefile' ] ] : []
     end
 
   end
 
-  class TestComponents < MiniTest::Unit::TestCase
+  class TestComponents < Minitest::Test
 
     def with_test_context( sp, host )
       ctx = TestContext.new( host, sp.default_options )

data/test/test_context.rb

@@ -21,7 +21,7 @@ require_relative 'setup'
 
 require 'syncwrap'
 
-class TestContext < MiniTest::Unit::TestCase
+class TestContext < Minitest::Test
   include SyncWrap
 
   def sp

data/test/test_context_rput.rb

@@ -21,7 +21,7 @@ require_relative 'setup'
 
 require 'syncwrap'
 
-class TestContextRput < MiniTest::Unit::TestCase
+class TestContextRput < Minitest::Test
   include SyncWrap
 
   VERBOSE = ARGV.include?( '--verbose' )

data/test/test_rsync.rb

@@ -22,7 +22,7 @@ require_relative 'setup'
 require 'syncwrap'
 require 'syncwrap/rsync'
 
-class TestRsync < MiniTest::Unit::TestCase
+class TestRsync < Minitest::Test
   include SyncWrap::Rsync
 
   def test_expand_implied_target

data/test/test_shell.rb

@@ -21,7 +21,7 @@ require_relative 'setup'
 
 require 'syncwrap/shell'
 
-class TestShell < MiniTest::Unit::TestCase
+class TestShell < Minitest::Test
   include TestOptions
   include SyncWrap::Shell
 
@@ -243,6 +243,7 @@ class TestShell < MiniTest::Unit::TestCase
       done
     SH
     exit_code, outputs = capture3( cmd )
+    assert_equal( 0, exit_code )
     assert_equal( 36_000, collect_stream( :err, outputs ).length )
     assert_equal( 0, collect_stream( :out, outputs ).length )
   end

data/test/test_space.rb

@@ -21,7 +21,7 @@ require_relative 'setup'
 
 require 'syncwrap'
 
-class TestSpace < MiniTest::Unit::TestCase
+class TestSpace < Minitest::Test
   include SyncWrap
 
   def sp
@@ -30,6 +30,10 @@ class TestSpace < MiniTest::Unit::TestCase
         # for test access:
         public :resolve_component_methods
       end
+      f = s.formatter
+      def f.write_component( *args )
+        #disable
+      end
     end
 
   end
@@ -65,6 +69,15 @@ class TestSpace < MiniTest::Unit::TestCase
   class Turnip
   end
 
+  class CompFailure < RuntimeError
+  end
+
+  class CompFail < Component
+    def install
+      raise CompFailure, "always fail"
+    end
+  end
+
   def test_host_roles
     sp.host( 'localhost' )
     assert_equal( 'localhost', sp.host( 'localhost' ).name )
@@ -219,4 +232,12 @@ class TestSpace < MiniTest::Unit::TestCase
     end
   end
 
+  def test_fail_raise
+    sp.host( 'localhost', CompFail.new )
+    sp.host( 'other', CompFail.new )
+    assert_raises( CompFailure ) do
+      sp.execute
+    end
+  end
+
 end

data/test/test_space_main.rb

@@ -22,7 +22,11 @@ require_relative 'setup'
 require 'syncwrap'
 require 'syncwrap/version_support.rb'
 
-class TestSpaceMain < MiniTest::Unit::TestCase
+class SyncWrap::IyyovDaemon
+  public :daemon_service_dir
+end
+
+class TestSpaceMain < Minitest::Test
   include SyncWrap
   include VersionSupport
 
@@ -35,7 +39,7 @@ class TestSpaceMain < MiniTest::Unit::TestCase
     end
   end
 
-  def test
+  def test_wrap
     skip if ( defined?( JRUBY_VERSION ) &&
               ( version_lt?( JRUBY_VERSION, [1,7,24] ) ||
                 ( version_gte?( JRUBY_VERSION, [9] ) &&

data/test/test_version_support.rb

@@ -21,7 +21,7 @@ require_relative 'setup'
 
 require 'syncwrap/version_support'
 
-class TestVersionSupport < MiniTest::Unit::TestCase
+class TestVersionSupport < Minitest::Test
   include SyncWrap::VersionSupport
 
   def test_to_a

data/test/test_zone_balancer.rb

@@ -21,10 +21,10 @@ require_relative 'setup'
 
 require 'syncwrap'
 
-class TestZoneBalancer < MiniTest::Unit::TestCase
+class TestZoneBalancer < Minitest::Test
   include SyncWrap
 
-  def test
+  def test_balance
     sp = Space.new
     zb = ZoneBalancer
     sp.with do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: syncwrap
 version: !ruby/object:Gem::Version
-  version: 2.7.1
+  version: 2.8.0
 platform: ruby
 authors:
 - David Kellum
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-02 00:00:00.000000000 Z
+date: 2016-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
@@ -98,14 +98,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.7.4
+        version: 5.8.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.7.4
+        version: 5.8.4
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -169,6 +169,7 @@ files:
 - lib/syncwrap/amazon_ec2.rb
 - lib/syncwrap/amazon_ws.rb
 - lib/syncwrap/base.rb
+- lib/syncwrap/change_key_listener.rb
 - lib/syncwrap/cli.rb
 - lib/syncwrap/component.rb
 - lib/syncwrap/components/amazon_linux.rb
@@ -212,6 +213,7 @@ files:
 - lib/syncwrap/ruby_support.rb
 - lib/syncwrap/shell.rb
 - lib/syncwrap/systemd.rb
+- lib/syncwrap/systemd_service.rb
 - lib/syncwrap/user_data.rb
 - lib/syncwrap/version_support.rb
 - lib/syncwrap/zone_balancer.rb
@@ -225,6 +227,7 @@ files:
 - sync/etc/sysctl.d/61-postgresql-shm.conf.erb
 - sync/etc/systemd/system/iyyov.service.erb
 - sync/etc/systemd/system/puma.service.erb
+- sync/etc/systemd/system/puma.socket.erb
 - sync/jruby/bin/jgem
 - sync/postgresql/environment
 - sync/postgresql/pg_ctl.conf