sfpagent 0.4.9 → 0.4.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 94a46954e0baa7fad3685faae5e88b9a2f7d769f
-  data.tar.gz: edf671fc44ffb00b0067bd09e1a7f59f051a2719
+  metadata.gz: a0edf95f2387a7f187b450258e964f16bb1a9dca
+  data.tar.gz: e4df10b602436a7b8edd971c109ba1202c004f0f
 SHA512:
-  metadata.gz: 4d4c45a2879ea273dd9ca19151ab01cfaada5475eadd81df40306be9856a2d4b46b17bba81e7babafaa8afdc704d713f4ed383ae4e13ee894acaa74bfb4f7d05
-  data.tar.gz: 3ada473126c4d2a3bde62295d255977c173f2de73d7bd6e7df80255482cc32a27480699f003f6b031dbeec1d6a3a8152a461929baed3632a9a6c0f942565d8ec
+  metadata.gz: 14b0d8589514d97d44dbb014547a995465a9c7c22022b98b81f6b46ad9290da9c8d192cf023c55cd9ebbaa0292463d68c48eaf123343d29acd3fb5f0368053e5
+  data.tar.gz: c32233497e0e74abd2de3fc2f409a4fc66c137eae57ffaddddb76ea76ec2561ffff6212ba8364a49667e7e78f346316f185cce8b2cf18899076c6ae7388454a2

data/VERSION

@@ -1 +1 @@
-0.4.9
+0.4.10

data/lib/sfpagent/agent.rb

@@ -629,8 +629,8 @@ module Sfp
 						begin
 							code, _ = NetHelper.put_data(agent['sfpAddress'], agent['sfpPort'], '/agents', http_data, 5, 20)
 							raise Exception if code != '200'
-						rescue Exception => e
-							Sfp::Agent.logger.warn "Push agents list to #{agent['sfpAddress']}:#{agent['sfpPort']} [Failed]"
+						rescue #Exception => e
+							#Sfp::Agent.logger.warn "Push agents list to #{agent['sfpAddress']}:#{agent['sfpPort']} [Failed]"
 						end
 					}
 				}

data/lib/sfpagent/bsig.rb

@@ -16,7 +16,6 @@ class Sfp::BSig
 		@lock = Mutex.new
 		@enabled = false
 		@status = :stopped
-		@lock_postprocess = Mutex.new
 	end
 
 	def stop
@@ -176,7 +175,7 @@ class Sfp::BSig
 				lock.synchronize { status << stat }
 			}
 		end
-		wait? { (status.length >= selected_operators.length) }
+		wait_until? { (status.length >= selected_operators.length) }
 		Sfp::Agent.logger.info "[#{mode}] exec status: #{status.inspect}"
 		status.each { |stat|
 			return :failure if stat == :failure
@@ -185,7 +184,7 @@ class Sfp::BSig
 		:repaired
 	end
 
-	def wait?
+	def wait_until?
 		until yield do
 			sleep 1
 		end
@@ -256,7 +255,7 @@ class Sfp::BSig
 					lock.synchronize { status << stat }
 				}
 			end
-			wait? { status.length >= agents_goal.length }
+			wait_until? { status.length >= agents_goal.length }
 			Sfp::Agent.logger.info "[#{mode}] achieve_remote_goal: #{status}"
 			status.each { |stat| return false if !stat }
 		end
@@ -557,18 +556,16 @@ class Sfp::BSig
 	end
 
 	def postprocess_delete_vm(operator)
-		@lock_postprocess.synchronize {
-			_, agent_name, _ = operator['parameters']['$.vm'].split('.', 3)
+		_, agent_name, _ = operator['parameters']['$.vm'].split('.', 3)
 
-			Sfp::Agent.logger.info "Postprocess delete VM #{agent_name}"
+		Sfp::Agent.logger.info "Postprocess delete VM #{agent_name}"
 
-			# update agents database (automatically broadcast to other agents)
-			Sfp::Agent.set_agents({agent_name => nil})
-		}
+		# update agents database (automatically broadcast to other agents)
+		Sfp::Agent.set_agents({agent_name => nil})
 	end
 
 	def postprocess_create_vm(operator)
-		@lock_postprocess.synchronize {
+		3.times do |i|
 			refs = operator['name'].split('.')
 			vms_ref = refs[0..-2].join('.') + '.vms'
 
@@ -598,6 +595,16 @@ class Sfp::BSig
 				address = data[agent_name]['sfpAddress']
 				port = data[agent_name]['sfpPort']
 
+				# wait until agent is running
+				wait_until? {
+					begin
+						code, _ = get_data(address, port, '/')
+						true
+					rescue
+						false
+					end
+				}
+
 				# push required modules
 				push_modules(model, address, port)
 
@@ -605,14 +612,14 @@ class Sfp::BSig
 				code, _ = put_data(address, port, '/agents', {'agents' => JSON.generate(Sfp::Agent.get_agents)})
 
 				# push new agent's model
-				code, _ = put_data(address, port, '/model', {'model' => JSON.generate({agent_name => model['model']})})
+				code1, _ = put_data(address, port, '/model', {'model' => JSON.generate({agent_name => model['model']})})
 
 				# push new agent's BSig model
-				code, _ = put_data(address, port, '/bsig', {'bsig' => JSON.generate(model['bsig'])}) if code == '200'
+				code2, _ = put_data(address, port, '/bsig', {'bsig' => JSON.generate(model['bsig'])}) if code == '200'
 
-				return (code == '200')
+				return (code1 == '200' and code2 == '200')
 			end
-		}
+		end
 		false
 	end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sfpagent
 version: !ruby/object:Gem::Version
-  version: 0.4.9
+  version: 0.4.10
 platform: ruby
 authors:
 - Herry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-09 00:00:00.000000000 Z
+date: 2013-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sfp