symphony 0.9.2 → 0.10.0.pre20150904120928

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 53cc6c7bef0985416836fbf99f95500ed4d40de4
-  data.tar.gz: b8974d95f36961b34c4e50a82bfdef93681fa2d6
+  metadata.gz: 5ac532bca93f670d19204728d5d1cd1d1a887b02
+  data.tar.gz: 9d1ef778dd4d19414739b855cb242f650e15252f
 SHA512:
-  metadata.gz: 7ee965658a4f05bc91447cd0771658e0f0e5875273c24991c558a03aee728ea134941b9ef0d49fb430cfd7aa249523b89cb3785a3187f5b075d1a7b6e0418d7f
-  data.tar.gz: 7cd25b5d827f48a5dab0607535e9e80b2fe9ea3d7ba75511aa8efff09e8809b658e11a8df31c95f72e6697ac1637fc7eecbaa032b5bbdf614e66ead26981eb3f
+  metadata.gz: c592497ebea87cdec1fc14dbb3a854d389fa70d293e148278fca8d7ee9e5e3d8790a3d3b760e30042bff48034f4837c8513b659bf5ccf06645341c51982b4844
+  data.tar.gz: e242316c2b893f106a7f1508ea735cade90f42d2fc208f9d11720eba123ad744cb660bbaa3f5060fd31bc8fde1434f06ed518597331686eaf3d01d17437fc983

data/ChangeLog

@@ -1,9 +1,30 @@
+2015-09-03  Michael Granger  <ged@FaerieMUD.org>
+
+	* lib/symphony/statistics.rb, lib/symphony/task_group/longlived.rb,
+	spec/symphony/task_group/longlived_spec.rb:
+	Invert scaling logic to handle initial load
+	[fd66c7ade2b0] [tip]
+
+2015-07-07  Michael Granger  <ged@FaerieMUD.org>
+
+	* .hgtags:
+	Added tag v0.9.2 for changeset a802f4bea30c
+	[a29e516eb7c7]
+
+	* .hgsigs:
+	Added signature for changeset 4171fb773f62
+	[a802f4bea30c] [v0.9.2]
+
+	* History.rdoc, lib/symphony.rb, symphony.gemspec:
+	Bump the patch version, update history.
+	[4171fb773f62]
+
 2015-07-07  Mahlon E. Smith  <mahlon@martini.nu>
 
 	* lib/symphony/task.rb:
 	Ensure the work callback's block returns the work() rval, instead of
 	the current time. This fixes Task acknowledgement.
-	[889ec4c329ed] [tip]
+	[889ec4c329ed]
 
 2015-06-08  Michael Granger  <ged@FaerieMUD.org>
 
@@ -26,7 +47,7 @@
 	The Daemon will now load them on startup. This is so code that can
 	depend on Symphony without loading every configured task anytime its
 	config loads.
-	[ade5a2647590]
+	[ade5a2647590] [github/master]
 
 2015-06-01  Michael Granger  <ged@FaerieMUD.org>
 
@@ -44,7 +65,7 @@
 
 	* spec/helpers.rb:
 	Add #message_count to the mock queue class
-	[3dad232548eb] [github/master]
+	[3dad232548eb]
 
 	* lib/symphony/routing.rb, spec/symphony/routing_spec.rb:
 	Fix the patterns used by Symphony::Routing

data/History.rdoc

@@ -1,21 +1,3 @@
-== v0.9.2 [2015-07-07] Mahlon E. Smith <mahlon@martini.nu>
-
-Fixes:
-
-- Ensure the work callback's block returns the work() rval, instead of
-  the current time. This fixes Task acknowledgement.
-
-
-== v0.9.1 [2015-06-08] Michael Granger <ged@FaerieMUD.org>
-
-Fixes:
-
-- Make Symphony.tasks contain just the task names.
-  The Daemon will now load task classes on startup. This is so code can
-  depend on Symphony without loading every configured task anytime its
-  config loads.
-
-
 == v0.9.0 [2015-06-01] Michael Granger <ged@FaerieMUD.org>
 
 Improvements:

data/lib/symphony/statistics.rb

@@ -20,6 +20,7 @@ module Symphony::Statistics
 		super
 		@samples = []
 		@sample_size = DEFAULT_SAMPLE_SIZE
+		@counter = 0
 	end
 
 
@@ -36,6 +37,7 @@ module Symphony::Statistics
 	def add_sample( value )
 		@samples << [ Time.now.to_f, value ]
 		@samples.pop( @samples.size - self.sample_size ) if @samples.size > self.sample_size
+		@counter = ( @counter + 1 ) % 3
 	end
 
 
@@ -51,6 +53,13 @@ module Symphony::Statistics
 	end
 
 
+	### Return the mean of the job count samples.
+	def mean_jobcount
+		return 0 unless self.samples.size >= self.sample_size
+		return @samples.map( &:last ).reduce( :+ ) / @samples.length.to_f
+	end
+
+
 	### Predict the likelihood that an upward trend will continue based on linear regression
 	### analysis of the given samples. If the value returned is >= 3.0, the values are
 	### statistically trending upwards, which in Symphony's case means that the workers are
@@ -87,7 +96,9 @@ module Symphony::Statistics
 
 		stde = Math.sqrt( (r / ( samples.size - 2 )) / s )
 
-		# Loggability[ Symphony ].debug "  job sampling trend is: %f" %  [ slope / stde ]
+		# Loggability[ Symphony ].debug "  job sampling trend is: %f" %  [ slope / stde ] if
+		# 	@counter.zero?
+
 		return slope / stde
 	end
 

data/lib/symphony/task.rb

@@ -346,8 +346,7 @@ class Symphony::Task
 			end
 
 			self.last_worked = Time.now
-			rval
-		end
+	end
 
 		return rval
 	end

data/lib/symphony/task_group/longlived.rb

@@ -34,8 +34,14 @@ class Symphony::TaskGroup::LongLived < Symphony::TaskGroup
 	def needs_a_worker?
 		return true unless self.started_one_worker?
 		return false unless @queue
-		return false if @queue.consumer_count >= self.max_workers
-		return self.sample_values_increasing?
+		if ( cc = @queue.consumer_count ) >= self.max_workers
+			self.log.debug "Already at max workers (%d)" % [ self.max_workers ]
+			return false
+		else
+			self.log.debug "Not yet at max workers (have %d)" % [ cc ]
+		end
+		self.log.debug "Mean jobcount is %0.2f" % [ self.mean_jobcount ]
+		return self.mean_jobcount > 1 && !self.sample_values_decreasing?
 	end
 
 

data/lib/symphony.rb

@@ -12,10 +12,10 @@ module Symphony
 	       Configurability
 
 	# Library version constant
-	VERSION = '0.9.2'
+	VERSION = '0.10.0'
 
 	# Version-control revision constant
-	REVISION = %q$Revision: 4171fb773f62 $
+	REVISION = %q$Revision: ade5a2647590 $
 
 
 	# The name of the environment variable to check for config file overrides

data/spec/symphony/task_group/longlived_spec.rb

@@ -28,6 +28,15 @@ describe Symphony::TaskGroup::LongLived do
 		described_class.new( task, 2 )
 	end
 
+	let( :pid_generator ) do
+		Enumerator.new do |generator|
+			i = 414
+			loop do
+				generator.yield( i )
+				i += rand( 3 ) + 1
+			end
+		end
+	end
 
 	# not enough samples
 	# trending up
@@ -46,8 +55,12 @@ describe Symphony::TaskGroup::LongLived do
 
 	context "when told to adjust its worker pool" do
 
+		before( :each ) do
+			allow( Process ).to receive( :fork ) { pid_generator.next }
+		end
+
+
 		it "starts an initial worker if it doesn't have any" do
-			expect( Process ).to receive( :fork ).and_return( 414 )
 			allow( Process ).to receive( :setpgid ).with( 414, 0 )
 
 			channel = double( Bunny::Channel )
@@ -69,7 +82,6 @@ describe Symphony::TaskGroup::LongLived do
 			samples = [ 1, 2, 2, 3, 3, 3, 4 ]
 			task_group.sample_size = samples.size
 
-			expect( Process ).to receive( :fork ).and_return( 525, 528 )
 			allow( Process ).to receive( :setpgid )
 
 			channel = double( Bunny::Channel )
@@ -80,7 +92,9 @@ describe Symphony::TaskGroup::LongLived do
 				with( task.queue_name, passive: true, prefetch: 0 ).
 				and_return( queue )
 
-			allow( queue ).to receive( :consumer_count ).and_return( 1 )
+			expect( queue ).to receive( :consumer_count ) do
+				task_group.pids.size
+			end.at_least( :once )
 			expect( queue ).to receive( :message_count ).and_return( *samples )
 
 			start = 1414002605
@@ -91,16 +105,15 @@ describe Symphony::TaskGroup::LongLived do
 			end
 
 			expect( task_group.started_one_worker? ).to be_truthy
-			expect( task_group.pids ).to include( 525, 528 )
+			expect( task_group.pids ).to include( 414 )
+			expect( task_group.pids.length ).to eq( 2 )
 		end
 
 
 		it "starts an additional worker if its work load is holding steady at a non-zero value" do
-			pending "this being a problem we see in practice"
 			samples = [ 4, 4, 4, 5, 5, 4, 4 ]
-			task_group.sample_size = samples.size
+			task_group.sample_size = samples.size - 3
 
-			expect( Process ).to receive( :fork ).and_return( 525, 528 )
 			allow( Process ).to receive( :setpgid )
 
 			channel = double( Bunny::Channel )
@@ -111,7 +124,9 @@ describe Symphony::TaskGroup::LongLived do
 				with( task.queue_name, passive: true, prefetch: 0 ).
 				and_return( queue )
 
-			allow( queue ).to receive( :consumer_count ).and_return( 1 )
+			expect( queue ).to receive( :consumer_count ) do
+				task_group.pids.size
+			end.at_least( :once )
 			expect( queue ).to receive( :message_count ).and_return( *samples )
 
 			start = 1414002605
@@ -126,11 +141,9 @@ describe Symphony::TaskGroup::LongLived do
 
 
 		it "doesn't start a worker if it's already running the maximum number of workers" do
-			samples =   [ 1, 2, 2, 3, 3, 3, 4, 4, 4, 5 ]
-			consumers = [ 1, 1, 1, 1, 1, 1, 1, 2, 2, 2 ]
+			samples = [ 1, 2, 2, 3, 3, 3, 4, 4, 4, 5 ]
 			task_group.sample_size = samples.size - 3
 
-			expect( Process ).to receive( :fork ).and_return( 525, 528 )
 			allow( Process ).to receive( :setpgid )
 
 			channel = double( Bunny::Channel )
@@ -141,7 +154,9 @@ describe Symphony::TaskGroup::LongLived do
 				with( task.queue_name, passive: true, prefetch: 0 ).
 				and_return( queue )
 
-			expect( queue ).to receive( :consumer_count ).and_return( *consumers )
+			expect( queue ).to receive( :consumer_count ) do
+				task_group.pids.size
+			end.at_least( :once )
 			expect( queue ).to receive( :message_count ).and_return( *samples )
 
 			start = 1414002605
@@ -159,7 +174,6 @@ describe Symphony::TaskGroup::LongLived do
 			samples = [ 0, 1, 0, 0, 0, 0, 1, 0, 0 ]
 			task_group.sample_size = samples.size - 3
 
-			expect( Process ).to receive( :fork ).and_return( 525 )
 			allow( Process ).to receive( :setpgid )
 
 			channel = double( Bunny::Channel )
@@ -188,7 +202,6 @@ describe Symphony::TaskGroup::LongLived do
 			samples = [ 4, 3, 3, 2, 2, 2, 1, 1, 0, 0 ]
 			task_group.sample_size = samples.size
 
-			expect( Process ).to receive( :fork ).and_return( 525 )
 			allow( Process ).to receive( :setpgid )
 
 			channel = double( Bunny::Channel )
@@ -199,7 +212,9 @@ describe Symphony::TaskGroup::LongLived do
 				with( task.queue_name, passive: true, prefetch: 0 ).
 				and_return( queue )
 
-			allow( queue ).to receive( :consumer_count ).and_return( 1 )
+			expect( queue ).to receive( :consumer_count ) do
+				task_group.pids.size
+			end.at_least( :once )
 			expect( queue ).to receive( :message_count ).and_return( *samples )
 
 			start = 1414002605

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: symphony
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.10.0.pre20150904120928
 platform: ruby
 authors:
 - Michael Granger
@@ -31,7 +31,7 @@ cert_chain:
   G8LHR7EjtPPmqCCunfyecJ6MmCNaiJCBxq2NYzyNmluPyHT8+0fuB5kccUVZm6CD
   xn3DzOkDE6NYbk8gC9rTsA==
   -----END CERTIFICATE-----
-date: 2015-07-07 00:00:00.000000000 Z
+date: 2015-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: configurability
@@ -356,9 +356,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: 2.0.3
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.7