sfpagent 0.4.7 → 0.4.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 756db80c9a4995bba51be6402b3ed1589d4dc48a
-  data.tar.gz: a723b67ba8d1f649f8c4c2c01c9682581721970e
+  metadata.gz: 379783979940f9c3e00cb6d7d87cfe70f2141394
+  data.tar.gz: 3de89027212aa57b1f7e19f06af789c108711470
 SHA512:
-  metadata.gz: 0db50466b23803da4ee8a613d0c506d85c0866715831d54eb6375ad4d794ab69a253060aa0ceb66348204598a9b0a0a741680dd2ba6daee3a4b4fb6216ad276f
-  data.tar.gz: 404edcde4d8942123e912ac130d6a015a7a3317a5c565ed074732979a5bc9f13e6ff6994d09c083239e342cac0a7db38601592daf3eb3d22d1b5530d91544455
+  metadata.gz: 779c7727e036da6f400cc9a2237f03ee609d54b9fb7f8dacc781720be30ef89b76e53ab999b205f59b894d7991ba1057c71b346562942ea091b0d552492f4f1d
+  data.tar.gz: 17de98cf9906dfaba55362a4a2948606e150185a53a841552a00b4e5232ce53cfdb15a7e4c809ca1d9042c2238ee127fe3b21325e6a5f8f74e15f34337afe639

data/VERSION

@@ -1 +1 @@
-0.4.7
+0.4.8

data/lib/sfpagent/bsig.rb

@@ -144,19 +144,17 @@ class Sfp::BSig
 	def parallel_achieve_local_goal(id, goal, operators, pi, mode)
 		current = get_current_state
 		flaws = compute_flaws(goal, current)
-		#Sfp::Agent.logger.info "[#{mode}] flaws: #{flaws.inspect}"
 
 		return :no_flaw if flaws.length <= 0
 		
-		operators = select_operators(flaws, operators, pi)
-		return :failure if operators == :failure
+		selected_operators = select_operators(flaws, operators, pi)
+		return :failure if selected_operators == :failure
 		
-		Sfp::Agent.logger.info "total operators: #{operators.length}"
+		Sfp::Agent.logger.info "total operators: #{selected_operators.length}"
 
-		total = operators.length
 		status = []
 		lock = Mutex.new
-		operators.each do |operator|
+		selected_operators.each do |operator|
 			Thread.new {
 				begin
 					stat = execute_operator(operator, id, operators, mode)
@@ -168,7 +166,7 @@ class Sfp::BSig
 				lock.synchronize { status << stat }
 			}
 		end
-		wait? { status.length >= operators.length }
+		wait? { (status.length >= selected_operators.length) }
 		Sfp::Agent.logger.info "[#{mode}] exec status: #{status.inspect}"
 		status.each { |stat|
 			return :failure if stat == :failure
@@ -460,7 +458,10 @@ class Sfp::BSig
 			end
 			break if repaired.length >= flaws.length
 		end
-		return :failure if repaired.length < flaws.length
+		if selected_operators.length <= 0 #repaired.length < flaws.length
+			Sfp::Agent.logger.error "No flaws can be repaired - pi=#{pi}\nflaws: #{flaws.inspect}"
+			return :failure
+		end
 		selected_operators
 	end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sfpagent
 version: !ruby/object:Gem::Version
-  version: 0.4.7
+  version: 0.4.8
 platform: ruby
 authors:
 - Herry