Rooba
/
boinc
mirror of https://github.com/BOINC/boinc.git
1
0
Fork 0
Code Issues 1 Packages Projects Releases Wiki Activity

android: added retry loops to get_project_conf, login and registration routines to be more robust on bad connection. Related ticket #1284.

This commit is contained in:
Joachim Fritzsch 2013-06-12 16:09:18 +02:00
parent 4ff620acbb
commit 9aa929708a
3 changed files with 115 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
android/BOINC/res/values/configuration.xml
View File

@ -33,6 +33,10 @@
<integer name="minimum_device_status_refresh_rate_in_monitor_loops">1</integer>
<!-- configuration project attach -->
<integer name="attach_step_interval_ms">1000</integer>
<integer name="attach_get_project_config_retries">3</integer>
<integer name="attach_login_retries">5</integer>
<integer name="attach_creation_retries">5</integer>
<integer name="attach_attach_retries">5</integer>
<!-- configuration on tab layout -->
<bool name="tab_status">true</bool>
<bool name="tab_projects">true</bool>

55
android/BOINC/src/edu/berkeley/boinc/AttachProjectLoginActivity.java
View File

@ -361,36 +361,43 @@ public class AttachProjectLoginActivity extends Activity{
@Override
protected Integer doInBackground(String... params) {
String url = params[0];
Integer attemptCounter = 0;
Integer maxAttempts = getResources().getInteger(R.integer.attach_get_project_config_retries);
try{
if(!projectInfoPresent) { // only url string is available
if(Logging.DEBUG) Log.d(Logging.TAG, "doInBackground() - GetProjectConfig for manual input url: " + url);
while(attemptCounter < maxAttempts) {
if(!projectInfoPresent) { // only url string is available
if(Logging.DEBUG) Log.d(Logging.TAG, "doInBackground() - GetProjectConfig for manual input url: " + url);
if(checkProjectAlreadyAttached(url)) return R.string.attachproject_error_project_exists;
//fetch ProjectConfig
projectConfig = monitor.getProjectConfig(url);
} else {
if(Logging.DEBUG) Log.d(Logging.TAG, "doInBackground() - GetProjectConfig for list selection url: " + projectInfo.url);
if(checkProjectAlreadyAttached(projectInfo.url)) return R.string.attachproject_error_project_exists;
//fetch ProjectConfig
projectConfig = monitor.getProjectConfig(projectInfo.url);
// fetch project logo
loadBitmap();
}
if(checkProjectAlreadyAttached(url)) return R.string.attachproject_error_project_exists;
//fetch ProjectConfig
projectConfig = monitor.getProjectConfig(url);
} else {
if(Logging.DEBUG) Log.d(Logging.TAG, "doInBackground() - GetProjectConfig for list selection url: " + projectInfo.url);
if(checkProjectAlreadyAttached(projectInfo.url)) return R.string.attachproject_error_project_exists;
//fetch ProjectConfig
projectConfig = monitor.getProjectConfig(projectInfo.url);
// fetch project logo
loadBitmap();
}
if (projectConfig != null && projectConfig.error_num != null && projectConfig.error_num == 0) {
return 0;
} else {
if(Logging.DEBUG) Log.d(Logging.TAG,"getProjectConfig returned error num:" + projectConfig.error_num);
return R.string.attachproject_login_error_toast;
if (projectConfig != null && projectConfig.error_num != null && projectConfig.error_num == 0) {
// success
return 0;
} else {
if(Logging.DEBUG) if(projectConfig != null) Log.d(Logging.TAG,"getProjectConfig returned error num:" + projectConfig.error_num);
attemptCounter++;
}
}
} catch(Exception e) {
if(Logging.WARNING) Log.w(Logging.TAG,"error in doInBackround",e);
return R.string.attachproject_login_error_toast;
}
// if this code is reached, it failed, return
if(Logging.DEBUG) if(projectConfig != null) Log.d(Logging.TAG,"getProjectConfig returned error num:" + projectConfig.error_num);
return R.string.attachproject_login_error_toast;
}
@Override

109
android/BOINC/src/edu/berkeley/boinc/AttachProjectWorkingActivity.java
View File

@ -283,52 +283,103 @@ public class AttachProjectWorkingActivity extends Activity{
publishProgress(new Update(true, true, R.string.attachproject_working_connect,0));
// get authenticator
AccountOut account;
AccountOut account = null;
Integer attemptCounter = 0;
Integer maxAttempts = 0;
Boolean success = false;
int err = -1;
if(registration) {
// register account
publishProgress(new Update(false, false, R.string.attachproject_working_register,0));
if(Logging.DEBUG) Log.d(Logging.TAG,"registration with: " + url + email + userName + pwd.length() + teamName);
account = monitor.createAccount(url, email, userName, pwd, teamName);
try {Thread.sleep(timeInterval);} catch (Exception e){}
if(account == null) {
if(Logging.DEBUG) Log.d(Logging.TAG,"registration failed, account info is null.");
publishProgress(new Update(true, false, R.string.attachproject_working_register, mapErrorNumToString(0)));
maxAttempts = getResources().getInteger(R.integer.attach_creation_retries);
if(Logging.DEBUG) Log.d(Logging.TAG,"registration with: " + url + email + userName + pwd.length() + teamName + maxAttempts);
// retry a defined number of times, if non deterministic failure occurs.
// makes login more robust on bad network connections
while(!success && attemptCounter < maxAttempts) {
account = monitor.createAccount(url, email, userName, pwd, teamName);
if(account == null || account.error_num != BOINCErrors.ERR_OK) {
// failed
if(account != null) err = account.error_num;
if(Logging.DEBUG) Log.d(Logging.TAG,"registration failed, error code: " + err);
if(err == -1 || err == BOINCErrors.ERR_GETHOSTBYNAME){
// worth a retry
attemptCounter++;
} else {
// not worth a retry, return
publishProgress(new Update(true, false, R.string.attachproject_working_register, mapErrorNumToString(err)));
return false;
}
} else {
// successful
try {Thread.sleep(timeInterval);} catch (Exception e){}
publishProgress(new Update(true, true, R.string.attachproject_working_register,0));
success = true;
}
}
// reached end of loop, check if successful
if(!success) {
publishProgress(new Update(true, false, R.string.attachproject_working_register, mapErrorNumToString(err)));
return false;
}
if(account.error_num != BOINCErrors.ERR_OK) {
if(Logging.DEBUG) Log.d(Logging.TAG,"registration failed, error code: " + account.error_num);
publishProgress(new Update(true, false, R.string.attachproject_working_register, mapErrorNumToString(account.error_num)));
return false;
}
publishProgress(new Update(true, true, R.string.attachproject_working_register,0));
} else {
// lookup authenticator
publishProgress(new Update(false, false, R.string.attachproject_working_verify,0));
if(Logging.DEBUG) Log.d(Logging.TAG,"loging with: " + url + id + pwd.length() + usesName);
account = monitor.lookupCredentials(url, id, pwd, usesName);
try {Thread.sleep(timeInterval);} catch (Exception e){}
if(account == null) {
if(Logging.DEBUG) Log.d(Logging.TAG,"login failed, account info is null.");
publishProgress(new Update(true, false, R.string.attachproject_working_verify, mapErrorNumToString(0)));
maxAttempts = getResources().getInteger(R.integer.attach_login_retries);
if(Logging.DEBUG) Log.d(Logging.TAG,"loging with: " + url + id + pwd.length() + usesName + maxAttempts);
// retry a defined number of times, if non deterministic failure occurs.
// makes login more robust on bad network connections
while(!success && attemptCounter < maxAttempts) {
account = monitor.lookupCredentials(url, id, pwd, usesName);
if(account == null || account.error_num != BOINCErrors.ERR_OK) {
// failed
if(account != null) err = account.error_num;
if(Logging.DEBUG) Log.d(Logging.TAG,"registration failed, error code: " + err);
if(err == -1 || err == BOINCErrors.ERR_GETHOSTBYNAME){
// worth a retry
attemptCounter++;
} else {
// not worth a retry, return
publishProgress(new Update(true, false, R.string.attachproject_working_verify, mapErrorNumToString(err)));
return false;
}
} else {
// successful
try {Thread.sleep(timeInterval);} catch (Exception e){}
publishProgress(new Update(true, true, R.string.attachproject_working_verify,0));
success = true;
}
}
// reached end of loop, check if successful
if(!success) {
publishProgress(new Update(true, false, R.string.attachproject_working_verify, mapErrorNumToString(err)));
return false;
}
if(account.error_num != BOINCErrors.ERR_OK) {
if(Logging.DEBUG) Log.d(Logging.TAG,"login failed, error code: " + account.error_num);
publishProgress(new Update(true, false, R.string.attachproject_working_verify, mapErrorNumToString(account.error_num)));
return false;
}
publishProgress(new Update(true, true, R.string.attachproject_working_verify,0));
}
// attach project
attemptCounter = 0;
success = false;
maxAttempts = getResources().getInteger(R.integer.attach_attach_retries);
publishProgress(new Update(false, false, R.string.attachproject_working_login,0));
Boolean attach = monitor.attachProject(url, projectName, account.authenticator);
try {Thread.sleep(timeInterval);} catch (Exception e){}
if(!attach) {
while(!success && attemptCounter < maxAttempts) {
Boolean attach = monitor.attachProject(url, projectName, account.authenticator);
if(attach) {
// successful
success = true;
try {Thread.sleep(timeInterval);} catch (Exception e){}
publishProgress(new Update(true, true, R.string.attachproject_working_login,0));
} else {
// failed
attemptCounter++;
}
}
if(!success) {
// still failed
publishProgress(new Update(true, false, R.string.attachproject_working_login,0));
return false;
}
publishProgress(new Update(true, true, R.string.attachproject_working_login,0));
return true;
}