sfpagent 0.4.6 → 0.4.7

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 756db80c9a4995bba51be6402b3ed1589d4dc48a
+  data.tar.gz: a723b67ba8d1f649f8c4c2c01c9682581721970e
+SHA512:
+  metadata.gz: 0db50466b23803da4ee8a613d0c506d85c0866715831d54eb6375ad4d794ab69a253060aa0ceb66348204598a9b0a0a741680dd2ba6daee3a4b4fb6216ad276f
+  data.tar.gz: 404edcde4d8942123e912ac130d6a015a7a3317a5c565ed074732979a5bc9f13e6ff6994d09c083239e342cac0a7db38601592daf3eb3d22d1b5530d91544455

data/VERSION

@@ -1 +1 @@
-0.4.6
+0.4.7

data/lib/sfpagent/agent.rb

@@ -603,11 +603,12 @@ module Sfp
 				agents = (json == '' ? {} : JSON[json])
 				current_hash = agents.hash
 
-				data.each { |k,v|
-					if !agents.has_key?(k) or v.nil? or agents[k].hash != v.hash
-						agents[k] = v
-					end
-				}
+				#data.each { |k,v|
+				#	if !agents.has_key?(k) or v.nil? or agents[k].hash != v.hash
+				#		agents[k] = v
+				#	end
+				#}
+				agents.merge!(data)
 				agents.keys.each { |k| agents.delete(k) if agents[k].nil? }
 
 				if current_hash != agents.hash

data/lib/sfpagent/bsig.rb

@@ -17,7 +17,6 @@ class Sfp::BSig
 		@enabled = false
 		@status = :stopped
 		@lock_postprocess = Mutex.new
-		@locked_operators = []
 	end
 
 	def stop
@@ -32,21 +31,26 @@ class Sfp::BSig
 		}
 
 		Thread.new {
-			register_satisfier_thread(:reset)
+			begin
+				register_satisfier_thread(:reset)
 	
-			system("rm -f #{Home}/operator.*.lock")
-			system("rm -f #{Home}/bsig.satisfier.lock.*")
+				system("rm -f #{Home}/operator.*.lock")
+				system("rm -f #{Home}/bsig.satisfier.lock.*")
 	
-			Sfp::Agent.logger.info "[main] BSig engine is running."
+				Sfp::Agent.logger.info "[main] BSig engine is running."
 	
-			puts "BSig Engine is running with PID #{$$}"
-			File.open(Sfp::Agent::BSigPIDFile, 'w') { |f| f.write($$.to_s) }
+				puts "BSig Engine is running with PID #{$$}"
+				File.open(Sfp::Agent::BSigPIDFile, 'w') { |f| f.write($$.to_s) }
 	
-			self.execute_model
+				self.execute_model
 	
-			File.delete(SatisfierLockFile) if File.exist?(SatisfierLockFile)
-			Sfp::Agent.logger.info "[main] BSig engine has stopped."
+				File.delete(SatisfierLockFile) if File.exist?(SatisfierLockFile)
+				Sfp::Agent.logger.info "[main] BSig engine has stopped."
 
+			rescue Exception => exp
+				Sfp::Agent.logger.error "Cannot start BSig engine => #{exp}\n#{exp.backtrace.join("\n")}"
+			end
+			
 			@status = :stopped
 		}
 	end
@@ -154,8 +158,13 @@ class Sfp::BSig
 		lock = Mutex.new
 		operators.each do |operator|
 			Thread.new {
-				stat = execute_operator(operator, id, operators, mode)
-				Sfp::Agent.logger.info "[#{mode}] Execute_operator: #{operator['name']}#{JSON.generate(operator['parameters'])} => #{stat}"
+				begin
+					stat = execute_operator(operator, id, operators, mode)
+					Sfp::Agent.logger.info "[#{mode}] Execute_operator: #{operator['name']}#{JSON.generate(operator['parameters'])} => #{stat}"
+				rescue Exception => exp
+					stat = :failure
+					Sfp::Agent.logger.error "[#{mode}] Execute_operator: #{operator['name']}#{JSON.generate(operator['parameters'])} => #{stat} - #{exp}\n#{exp.backtrace.join("\n")}"
+				end
 				lock.synchronize { status << stat }
 			}
 		end
@@ -229,8 +238,13 @@ class Sfp::BSig
 			agents_goal = split_goal_by_agent(goal)
 			agents_goal.each do |agent_name,agent_goal|
 				Thread.new {
-					stat = achieve_remote_agent_goal(agents, agent_name, agent_goal, id, pi, mode)
-					Sfp::Agent.logger.info "[#{mode}] remote goal => #{agent_name}: #{agent_goal.inspect} - #{stat}"
+					begin
+						stat = achieve_remote_agent_goal(agents, agent_name, agent_goal, id, pi, mode)
+						Sfp::Agent.logger.info "[#{mode}] remote goal => #{agent_name}: #{agent_goal.inspect} - #{stat}"
+					rescue Exception => exp
+						stat = false
+						Sfp::Agent.logger.error "[#{mode}] remote goal => #{agent_name}: #{agent_goal.inspect} - #{stat} - #{exp}\n#{exp.backtrace.join("\n")}"
+					end
 					lock.synchronize { status << stat }
 				}
 			end
@@ -321,7 +335,6 @@ class Sfp::BSig
 			operator_lock_file = "#{Home}/operator.#{operator['id']}.#{operator['name']}.lock"
 			return false if File.exist?(operator_lock_file)
 			File.open(operator_lock_file, 'w') { |f| f.write('1') }
-			@locked_operators << operator
 			return true
 		}
 	end
@@ -335,7 +348,6 @@ class Sfp::BSig
 		@lock.synchronize {
 			operator_lock_file = "#{Home}/operator.#{operator['id']}.#{operator['name']}.lock"
 			File.delete(operator_lock_file) if File.exist?(operator_lock_file)
-			@lock_operators.delete(operator)
 		}
 	end
 
@@ -376,7 +388,7 @@ class Sfp::BSig
 			ref = "#{cloud_ref}.vms"
 			vms = state.at?(ref)
 			vms.each { |name,status| vms[name] = {'created' => true} } if vms.is_a?(Hash)
-		}
+		} if Sfp::Agent.runtime
 		if not vms.has_key?(agent_name)
 			state = {agent_name => {'created' => false, 'in_cloud' => nil}}
 			goal.each { |var,val| return false if state.at?(var) != val }
@@ -402,7 +414,7 @@ class Sfp::BSig
 					                'sfpPort' => Sfp::Agent::DefaultPort }
 				}
 			end
-		}
+		} if Sfp::Agent.runtime
 
 		state
 	end
@@ -441,9 +453,8 @@ class Sfp::BSig
 		repaired = {}
 		operators.each do |op|
 			next if op['pi'] < pi
-			if can_repair?(op, flaws) and                # can the operator repair the flaws?
-			   not threat?(op, selected_operators) and   # does the operator threat other selected operators?
-			   not threat?(op, @locked_operators)        # does the operator threat locked (being executed) operators?
+			if can_repair?(op, flaws) and                     # can the operator repair the flaws?
+			   not threat_operators?(op, selected_operators)  # does the operator threat other selected operators?
 				selected_operators << op
 				op['effect'].each { |var,val| repaired[var] = val if flaws[var] == val }
 			end
@@ -536,7 +547,7 @@ class Sfp::BSig
 
 	def postprocess_delete_vm(operator)
 		@lock_postprocess.synchronize {
-			_, agent_name, _ = operator['name'].split('.', 3)
+			_, agent_name, _ = operator['parameters']['$.vm'].split('.', 3)
 
 			Sfp::Agent.logger.info "Postprocess delete VM #{agent_name}"
 
@@ -611,7 +622,7 @@ class Sfp::BSig
 			modules = JSON[body]
 			list = ''
 			schemata.each { |m|
-				list += "#{m} " if m != 'object' and File.exist?("#{modules_dir}/#{m}") and
+				list += "#{m} " if File.exist?("#{modules_dir}/#{m}") and
 				                   (not modules.has_key?(m) or modules[m] != get_local_module_hash(m, modules_dir).to_s)
 			}
 

metadata

@@ -1,49 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: sfpagent
 version: !ruby/object:Gem::Version
-  version: 0.4.6
-  prerelease: 
+  version: 0.4.7
 platform: ruby
 authors:
 - Herry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-26 00:00:00.000000000 Z
+date: 2013-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sfp
-  requirement: &7919800 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.3.17
   type: :runtime
   prerelease: false
-  version_requirements: *7919800
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.3.17
 - !ruby/object:Gem::Dependency
   name: net-ssh
-  requirement: &7919080 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *7919080
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &7965620 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *7965620
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A Ruby implementation of SFP agent.
 email: herry13@gmail.com
 executables:
@@ -76,26 +84,25 @@ files:
 homepage: https://github.com/herry13/sfpagent
 licenses:
 - BSD
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: sfpagent
-rubygems_version: 1.8.11
+rubygems_version: 2.0.14
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: SFP Agent
 test_files: []