PL-433 retry on 500 concurrency fixes

Author: Christopher Brown

chef/lib/chef/config.rb

@@ -100,6 +100,7 @@ def self.manage_secret_key
 
 authorized_openid_identifiersnil
 authorized_openid_providersnil
+client_registration_retries5
 cookbook_path["/var/chef/cookbooks","/var/chef/site-cookbooks"]
 cookbook_tarball_path"/var/chef/cookbook-tarballs"
 couchdb_database"chef"

chef/lib/chef/rest.rb

@@ -66,26 +66,29 @@ def load_signing_key(key)
 
 # Register the client 
 defregister(name=Chef::Config[:node_name],destination=Chef::Config[:client_key])
-
-ifFile.exists?(destination)
-raiseChef::Exceptions::CannotWritePrivateKey,"I cannot write your private key to #{destination} - check permissions?"unlessFile.writable?(destination)
-end
+raiseChef::Exceptions::CannotWritePrivateKey,"I cannot write your private key to #{destination} - check permissions?"if(File.exists?(destination) && !File.writable?(destination))
 
 nc=Chef::ApiClient.new
 nc.name(name)
-response=nc.save(true,true)
-
-Chef::Log.debug("Registration response: #{response.inspect}")
-
-raiseChef::Exceptions::CannotWritePrivateKey,"The response from the server did not include a private key!"unlessresponse.has_key?("private_key")
 
-begin
-# Write out the private key
-file=File.open(destination,File::WRONLY|File::EXCL|File::CREAT,0600)
-file.print(response["private_key"])
-file.close
-rescue
-raiseChef::Exceptions::CannotWritePrivateKey,"I cannot write your private key to #{destination}"
+catch(:done)do
+retries=Chef::Config[:client_registration_retries] || 5
+retries.downto(0)do
+begin
+response=nc.save(true,true)
+Chef::Log.debug("Registration response: #{response.inspect}")
+raiseChef::Exceptions::CannotWritePrivateKey,"The response from the server did not include a private key!"unlessresponse.has_key?("private_key")
+# Write out the private key
+file=File.open(destination,"w")
+file.print(response["private_key"])
+file.close
+throw:done
+rescueIOError
+raiseChef::Exceptions::CannotWritePrivateKey,"I cannot write your private key to #{destination}"
+rescueNet::HTTPFatalError=>e
+raiseunlesse.response.code == "500"
+end
+end
 end
 
 true