More cleanup

Fixing the /etc/xen/auto variable

1 files changed, 31 insertions, 1 deletions

diff --git a/cloudmasterd/lib/cloudmasterd.rb b/cloudmasterd/lib/cloudmasterd.rb
index 2bffbbc..a9303c7 100644
--- a/cloudmasterd/lib/cloudmasterd.rb
+++ b/cloudmasterd/lib/cloudmasterd.rb
@@ -20,6 +20,12 @@ Cloudmasterd.picnic!
 module Cloudmasterd::Helpers
   class Syncer
     def self.run
+      sync_memory
+      sync_state
+      sync_owners
+    end
+
+    def self.sync_memory
       # Figure out the current amount of memory
       freemem = 0
       `func '*' call virt freemem`.split("\n").each{|mem| freemem = freemem + mem.to_i}
@@ -30,7 +36,9 @@ module Cloudmasterd::Helpers
       else
         memory[0].update_attribute(:free, freemem)
       end
+    end
 
+    def self.sync_state
       current_state = {}
       Open3.popen3("func '*' call virt state") do |stdin, stdout, stderr|
         # Parse out the hosts based on the func output (stripping off https:// and the port)
@@ -64,6 +72,28 @@ module Cloudmasterd::Helpers
         Cloudmasterd::Models::Machine.create :name => name, :email => "Unknown", :cloud => machine[:cloud], :state => machine[:state]
       end
     end
+
+    def self.sync_owners
+      # Sync up any unowned machines that now have an owner (handles race condition with syncing states)
+      unowned_machines = {}
+      Cloudmasterd::Models::Machine.find(:all, :conditions => "email = 'Unknown'").each do |machine|
+        unowned_machines[machine.name] = machine
+      end
+
+      owned_machines = {}
+      Cloudmasterd::Models::Machine.find(:all, :conditions => "email <> 'Unknown'").each do |machine|
+        owned_machines[machine.name] = machine
+      end
+
+      owned_machines.each do |name, machine|
+        if unowned_machines.has_key?(name) then
+          # Delete the unowned machine and update the owned one
+          u_machine = unowned_machines[name]
+          machine.update_attributes(:cloud => u_machine.cloud, :state => u_machine.state)
+          u_machine.destroy()
+        end
+      end
+    end
   end
 
   class Cobblerd
@@ -175,7 +205,7 @@ module Cloudmasterd::Controllers
       raise output unless $?.success?
 
       # Make the new host autostart
-      `func "#{host}" call command run "ln -s /etc/xen/#{fqdn.split('.')[0]} /etc/xen/auto/"`
+      `func "#{host}" call command run "ln -s /etc/xen/#{fqdn} /etc/xen/auto/"`
     end
 
     # POST /koan