OpenSource/jenkins
1
0 Fork 0
mirror of https://github.com/jenkinsci/jenkins.git synced 2026-11-15 13:02:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

JENKINS-33244 / JENKINS-34174 - retry for failed plugins & specify

Browse Source 
download timeout
This commit is contained in:
kzantow committed 2016-04-21 17:27:36 -04:00
1 parent d1bcd1feba
commit 6974d2b759
6 files changed
+130 -28
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

core/src/main/java/hudson/PluginManager.java
+28 -4
View File
@@ -36,6 +36,8 @@ import hudson.model.Failure;
import hudson.model.ItemGroupMixIn;
import hudson.model.UpdateCenter;
import hudson.model.UpdateSite;
import hudson.model.UpdateCenter.DownloadJob;
import hudson.model.UpdateCenter.InstallationJob;
import hudson.security.Permission;
import hudson.security.PermissionScope;
import hudson.util.CyclicGraphDetector;
@@ -1055,6 +1057,20 @@ public abstract class PluginManager extends AbstractModelObject implements OnMas
return new HttpRedirect("./sites");
}
/**
* Called to progress status beyond installing plugins, e.g. if
* there were failures that prevented installation from naturally proceeding
*/
@RequirePOST
@Restricted(DoNotUse.class) // WebOnly
public void doInstallPluginsDone() {
Jenkins j = Jenkins.getInstance();
j.checkPermission(Jenkins.ADMINISTER);
if(InstallState.INITIAL_PLUGINS_INSTALLING.equals(j.getInstallState())) {
Jenkins.getInstance().setInstallState(InstallState.INITIAL_PLUGINS_INSTALLING.getNextState());
}
}
/**
* Performs the installation of the plugins.
@@ -1182,22 +1198,30 @@ public abstract class PluginManager extends AbstractModelObject implements OnMas
new Thread() {
@Override
public void run() {
final boolean failures[] = { false };
INSTALLING: while (true) {
try {
updateCenter.persistInstallStatus();
updateCenter.persistInstallStatus();
Thread.sleep(500);
failures[0] = false;
for (Future<UpdateCenter.UpdateCenterJob> jobFuture : installJobs) {
if(!jobFuture.isDone() && !jobFuture.isCancelled()) {
continue INSTALLING;
}
UpdateCenter.UpdateCenterJob job = jobFuture.get();
if(job instanceof InstallationJob && ((InstallationJob)job).status instanceof DownloadJob.Failure) {
failures[0] = true;
}
}
} catch (InterruptedException e) {
} catch (Exception e) {
LOGGER.log(WARNING, "Unexpected error while waiting for initial plugin set to install.", e);
}
break;
}
updateCenter.persistInstallStatus();
jenkins.setInstallState(InstallState.INITIAL_PLUGINS_INSTALLING.getNextState());
updateCenter.persistInstallStatus();
if(!failures[0]) {
jenkins.setInstallState(InstallState.INITIAL_PLUGINS_INSTALLING.getNextState());
}
}
}.start();
}