Merge lp:~cgb-cs/appscale/main-no-timeouts into lp:appscale

[Chris Bunch]

Eliminating timeouts for AppController and UserAppClient interactions.

[Navraj Chohan (nchohan)]

review: Approve

=== modified file 'AppController/lib/app_controller_client.rb'
--- AppController/lib/app_controller_client.rb	2011-06-15 08:35:38 +0000
+++ AppController/lib/app_controller_client.rb	2011-09-30 01:24:37 +0000
@@ -34,12 +34,12 @@
     @conn.add_method("remove_role", "old_role", "secret")
   end
   
-  def make_call(time, retry_on_except, callr, ok_to_fail=false)
+  def make_call(retry_on_except, callr, ok_to_fail=false)
     refused_count = 0
     max = 10
 
     begin
-      Timeout::timeout(time) {
+      Timeout::timeout(NO_TIMEOUT) {
         yield if block_given?
       }
     rescue Errno::ECONNREFUSED
@@ -93,7 +93,7 @@
 
   def set_parameters(locations, creds, apps_to_start)
     result = ""
-    make_call(10, ABORT_ON_FAIL, "set_parameters") { 
+    make_call(ABORT_ON_FAIL, "set_parameters") { 
       result = conn.set_parameters(locations, creds, apps_to_start, @secret)
     }  
     abort(result) if result =~ /Error:/
@@ -101,7 +101,7 @@
 
   def set_apps(app_names)
     result = ""
-    make_call(10, ABORT_ON_FAIL, "set_apps") { 
+    make_call(ABORT_ON_FAIL, "set_apps") { 
       result = conn.set_apps(app_names, @secret)
     }  
     abort(result) if result =~ /Error:/
@@ -119,42 +119,42 @@
   end
 
   def get_status(ok_to_fail=false)
-    make_call(10, !ok_to_fail, "get_status", ok_to_fail) { @conn.status(@secret) }
+    make_call(!ok_to_fail, "get_status", ok_to_fail) { @conn.status(@secret) }
   end
 
   def get_stats(ok_to_fail=false)
-    make_call(10, !ok_to_fail, "get_stats", ok_to_fail) { @conn.get_stats(@secret) }
+    make_call(!ok_to_fail, "get_stats", ok_to_fail) { @conn.get_stats(@secret) }
   end
 
   def stop_app(app_name)
-    make_call(30, RETRY_ON_FAIL, "stop_app") { @conn.stop_app(app_name, @secret) }
+    make_call(RETRY_ON_FAIL, "stop_app") { @conn.stop_app(app_name, @secret) }
   end
   
   def update(app_names)
-    make_call(30, RETRY_ON_FAIL, "update") { @conn.update(app_names, @secret) }
+    make_call(RETRY_ON_FAIL, "update") { @conn.update(app_names, @secret) }
   end
 
   def done()
-    make_call(30, RETRY_ON_FAIL, "done", ok_to_fail=true) { @conn.done(@secret) }
+    make_call(RETRY_ON_FAIL, "done", ok_to_fail=true) { @conn.done(@secret) }
   end
  
   def get_all_public_ips()
-    make_call(30, RETRY_ON_FAIL, "get_all_public_ips") { @conn.get_all_public_ips(@secret) }
+    make_call(RETRY_ON_FAIL, "get_all_public_ips") { @conn.get_all_public_ips(@secret) }
   end
 
   def backup_appscale(backup_info)
-    make_call(NO_TIMEOUT, RETRY_ON_FAIL, "backup_appscale") { @conn.backup_appscale(backup_info, @secret) }
+    make_call(RETRY_ON_FAIL, "backup_appscale") { @conn.backup_appscale(backup_info, @secret) }
   end
 
   def add_role(role)
-    make_call(NO_TIMEOUT, RETRY_ON_FAIL, "add_role") { @conn.add_role(role, @secret) }
+    make_call(RETRY_ON_FAIL, "add_role") { @conn.add_role(role, @secret) }
   end
 
   # CGB - removed timeout here - removing cassandra slave requires it to port
   # the data it owns to somebody else, which takes ~30 seconds in the trivial
   # case
   def remove_role(role)
-    make_call(NO_TIMEOUT, RETRY_ON_FAIL, "remove_role") { @conn.remove_role(role, @secret) }
+    make_call(RETRY_ON_FAIL, "remove_role") { @conn.remove_role(role, @secret) }
   end
 
   def run_neptune_job(nodes, job_data)
@@ -163,7 +163,7 @@
     if NEPTUNE_JOBS.include?(type)
       method_to_call = "neptune_#{type}_run_job"
       @conn.add_method(method_to_call, "nodes", "job_data", "secret")
-      make_call(30, RETRY_ON_FAIL, "run_neptune_job") { @conn.send(method_to_call.to_sym, nodes, job_data, @secret) }
+      make_call(RETRY_ON_FAIL, "run_neptune_job") { @conn.send(method_to_call.to_sym, nodes, job_data, @secret) }
     else
       not_supported_message = "The job type you specified, '#{type}', is " +
        "not supported. Supported jobs are #{NEPTUNE_JOBS.join(', ')}."

=== modified file 'AppController/lib/user_app_client.rb'
--- AppController/lib/user_app_client.rb	2011-05-16 07:56:58 +0000
+++ AppController/lib/user_app_client.rb	2011-09-30 01:24:37 +0000
@@ -6,6 +6,8 @@
 require 'soap/rpc/driver'
 require 'timeout'
 
+NO_TIMEOUT = -1
+
 class UserAppClient
   attr_reader :conn, :ip, :secret
 
@@ -29,10 +31,10 @@
     @conn.add_method("get_all_apps", "secret")
   end
 
-  def make_call(timeout, retry_on_except)
+  def make_call(retry_on_except)
     result = ""
     begin
-      Timeout::timeout(timeout) do
+      Timeout::timeout(NO_TIMEOUT) do
         begin
           yield if block_given?
         end
@@ -58,7 +60,7 @@
   
   def commit_new_user(user, encrypted_password, user_type, retry_on_except=true)
     result = ""
-    make_call(10, retry_on_except) { 
+    make_call(retry_on_except) { 
       result = @conn.commit_new_user(user, encrypted_password, user_type, @secret)
     }
 
@@ -78,7 +80,7 @@
   
   def commit_new_app_name(user, app_name, language, retry_on_except=true)
     result = ""
-    make_call(10, retry_on_except) {
+    make_call(retry_on_except) {
       result = @conn.commit_new_app(user, app_name, language, @secret)
     }
 
@@ -98,7 +100,7 @@
     tar_contents = Base64.encode64(file.read)
     
     result = ""
-    make_call(300, retry_on_except) {
+    make_call(retry_on_except) {
       result = @conn.commit_tar(app_name, tar_contents, @secret)
     }
  
@@ -113,7 +115,7 @@
   
   def change_password(user, new_password, retry_on_except=true)
     result = ""
-    make_call(10, retry_on_except) {
+    make_call(retry_on_except) {
       result = @conn.change_password(user, new_password, @secret)
     }
         
@@ -128,7 +130,7 @@
 
   def delete_app(app, retry_on_except=true)
     result = ""
-    make_call(10, retry_on_except) {
+    make_call(retry_on_except) {
       result = @conn.delete_app(app, @secret)
     }
     
@@ -141,7 +143,7 @@
 
   def does_app_exist?(app, retry_on_except=true)
     result = ""
-    make_call(10, retry_on_except) {
+    make_call(retry_on_except) {
       result = @conn.is_app_enabled(app, @secret)
     }
     
@@ -150,7 +152,7 @@
   
   def does_user_exist?(user, retry_on_except=true)
     result = ""
-    make_call(10, retry_on_except) {
+    make_call(retry_on_except) {
       result = @conn.does_user_exist(user, @secret)
     }
     
@@ -159,7 +161,7 @@
 
   def get_user_data(username, retry_on_except=true)
     result = ""
-    make_call(10, retry_on_except) {
+    make_call(retry_on_except) {
       result = @conn.get_user_data(username, @secret)
     }
 
@@ -168,7 +170,7 @@
 
   def get_app_data(appname, retry_on_except=true)
     result = ""
-    make_call(10, retry_on_except) {
+    make_call(retry_on_except) {
       result = @conn.get_app_data(appname, @secret)
     }
 
@@ -177,7 +179,7 @@
 
   def delete_instance(appname, host, port, retry_on_except=true)
     result = ""
-    make_call(10, retry_on_except) {
+    make_call(retry_on_except) {
       result = @conn.delete_instance(appname, host, port, @secret)
     }
 
@@ -186,7 +188,7 @@
 
   def get_all_apps(retry_on_except=true)
     result = ""
-    make_call(10, retry_on_except) {
+    make_call(retry_on_except) {
       result = @conn.get_all_apps(@secret)
     }
 
@@ -195,7 +197,7 @@
 
   def get_tar(appname, retry_on_except=true)
     result = ""
-    make_call(300, retry_on_except) {
+    make_call(retry_on_except) {
       result = @conn.get_tar(appname, @secret)
     }
 
@@ -204,7 +206,7 @@
 
   def add_instance(appname, host, port, retry_on_except=true)
     result = ""
-    make_call(10, retry_on_except) {
+    make_call(retry_on_except) {
       result = @conn.add_instance(appname, host, port, @secret)
     }