modules/enterprise/gui/installer/src/main/java/org/rhq/enterprise/gui/installer/server/servlet/InstallerGWTServiceImpl.java | 5 +++-- modules/enterprise/gui/installer/src/main/java/org/rhq/enterprise/gui/installer/server/servlet/ServerInstallUtil.java | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-)
New commits: commit 7713848c0267cf46c7723118eb1a36cb24c0fb17 Author: John Mazzitelli mazz@redhat.com Date: Thu Sep 20 17:23:55 2012 -0400
the installer should skip if the ear is currently deploying
diff --git a/modules/enterprise/gui/installer/src/main/java/org/rhq/enterprise/gui/installer/server/servlet/InstallerGWTServiceImpl.java b/modules/enterprise/gui/installer/src/main/java/org/rhq/enterprise/gui/installer/server/servlet/InstallerGWTServiceImpl.java index ba636a2..70b6637 100644 --- a/modules/enterprise/gui/installer/src/main/java/org/rhq/enterprise/gui/installer/server/servlet/InstallerGWTServiceImpl.java +++ b/modules/enterprise/gui/installer/src/main/java/org/rhq/enterprise/gui/installer/server/servlet/InstallerGWTServiceImpl.java @@ -120,9 +120,10 @@ public class InstallerGWTServiceImpl extends RemoteServiceServlet implements Ins String deployDir = client.getAppServerDefaultDeploymentDir(); boolean deployedExists = ServerInstallUtil.markerFileExists(deployDir, EAR_NAME, Marker.DEPLOYED); boolean failedExists = ServerInstallUtil.markerFileExists(deployDir, EAR_NAME, Marker.FAILED); + boolean isDeployingExists = ServerInstallUtil.markerFileExists(deployDir, EAR_NAME, Marker.ISDEPLOYING); if (!failedExists) { - if (deployedExists) { - return ""; // everything looks OK and the ear has been successfully deployed + if (deployedExists || isDeployingExists) { + return ""; // everything looks OK and the ear either has been successfully deployed or is deploying } else { return null; // installer hasn't done anything yet } diff --git a/modules/enterprise/gui/installer/src/main/java/org/rhq/enterprise/gui/installer/server/servlet/ServerInstallUtil.java b/modules/enterprise/gui/installer/src/main/java/org/rhq/enterprise/gui/installer/server/servlet/ServerInstallUtil.java index 855091c..1fc4388 100644 --- a/modules/enterprise/gui/installer/src/main/java/org/rhq/enterprise/gui/installer/server/servlet/ServerInstallUtil.java +++ b/modules/enterprise/gui/installer/src/main/java/org/rhq/enterprise/gui/installer/server/servlet/ServerInstallUtil.java @@ -83,7 +83,8 @@ public class ServerInstallUtil { };
public enum Marker { - DO_DEPLOY(".dodeploy"), SKIP_DEPLOY(".skipdeploy"), DEPLOYED(".deployed"), FAILED(".failed"); + DO_DEPLOY(".dodeploy"), SKIP_DEPLOY(".skipdeploy"), DEPLOYED(".deployed"), FAILED(".failed"), ISDEPLOYING( + ".isdeploying");
private String extension;
@@ -117,7 +118,7 @@ public class ServerInstallUtil { CoreJBossASClient client = new CoreJBossASClient(mcc);
// the EAR could take a long time to deploy, increase the deployment timeout - client.setAppServerDefaultDeploymentTimeout(240); // 30 minutes should be plenty of time + client.setAppServerDefaultDeploymentTimeout(1800); // 30 minutes should be plenty of time
// We don't need to scan the deployment directory after everything is installed. // TODO: We would like this to be 0, so it only scans at startup, but the installer
rhq-commits@lists.fedorahosted.org