July 2010 - Isis-fish-commits - mailman.cloud.codelutin.com

r3096 - isis-fish/branches/3.3.0.4-disworksupport/src/main/java/fr/ifremer/isisfish/simulator/launcher
by bleny＠users.labs.libre-entreprise.org 28 Jul '10

28 Jul '10

Author: bleny Date: 2010-07-28 11:54:10 +0000 (Wed, 28 Jul 2010) New Revision: 3096 Log: corrections launcher diswork Modified: isis-fish/branches/3.3.0.4-disworksupport/src/main/java/fr/ifremer/isisfish/simulator/launcher/DisworkSimulatorLauncher.java Modified: isis-fish/branches/3.3.0.4-disworksupport/src/main/java/fr/ifremer/isisfish/simulator/launcher/DisworkSimulatorLauncher.java =================================================================== --- isis-fish/branches/3.3.0.4-disworksupport/src/main/java/fr/ifremer/isisfish/simulator/launcher/DisworkSimulatorLauncher.java 2010-07-23 12:52:09 UTC (rev 3095) +++ isis-fish/branches/3.3.0.4-disworksupport/src/main/java/fr/ifremer/isisfish/simulator/launcher/DisworkSimulatorLauncher.java 2010-07-28 11:54:10 UTC (rev 3096) @@ -25,6 +25,7 @@ import org.nuiton.util.FileUtil; import org.nuiton.util.ZipUtil; +import fr.ifremer.isisfish.IsisConfig; import fr.ifremer.isisfish.IsisFish; import fr.ifremer.isisfish.datastore.SimulationStorage; import fr.ifremer.isisfish.simulator.SimulationControl; @@ -39,10 +40,12 @@ LogFactory.getLog(DisworkSimulatorLauncher.class); protected static final String ISIS_APPLICATION_NAME = "isis-fish"; - protected static final String ISIS_APPLICATION_VERSION = IsisFish.config.getVersion(); - + protected static final String ISIS_APPLICATION_VERSION = IsisConfig.getVersion(); + protected static DisworkDaemon disworkDaemon; + /** true if an error occurs of is {@link #close()} is called + * if true, no operation are permitted */ protected static boolean closed = false; /** for each job id, the corresponding job description */ @@ -52,23 +55,28 @@ public DisworkSimulatorLauncher() {} protected synchronized static DisworkDaemon getDaemon() throws RemoteException { + // lazy creation of the daemon. Thus, daemon will not be run when // isis is used on caparmor or as diswork application - if (disworkDaemon == null) { + initDaemon(); } return disworkDaemon; } - + protected static void initDaemon() throws RemoteException { + // create a DisworkConfig according to the isis config DisworkConfig config = new DisworkConfig(); config.setBootstrapIp(IsisFish.config.getDisworkBootstrapIp()); config.setBootstrapPort(IsisFish.config.getDisworkBootstrapPort()); config.setUsedPort(IsisFish.config.getDisworkPort()); + // to be removed : config.setActivityStrategy("unlimited"); - config.setHttpFrontendPort(8081); + config.setHttpFrontendPort(9090); + + // starting the daemon try { disworkDaemon = new DisworkDaemon(config); } catch (DisworkException e) { @@ -90,12 +98,12 @@ // now, checks if isis-fish in the current version is available on - // diswork for other nodes. If not, application is downloader and + // diswork for other nodes. If not, application is downloaded and // submitted // no exception thrown below, even if it fails we can hope that // application is already available. If it's not the case, a - // exception will be raised at job submission + // exception will be raised at job submission URL isisDownloadUrl = null; InputStream applicationData = null; try { @@ -134,6 +142,7 @@ @Override public void simulate(SimulationService simulationService, SimulationItem simulationItem) throws RemoteException { + // check if daemon is available if (closed) { simulationItem.getControl().setText("unable to connect to diswork"); @@ -143,7 +152,7 @@ try { Thread.sleep(1 * 1000); } catch (InterruptedException e) { - throw new RemoteException("lancher interrupted", e); + throw new RemoteException("launcher interrupted", e); } throw new RemoteException("daemon has been closed"); } @@ -230,27 +239,39 @@ return simulationStorage; } + /** when a given job is finished, copy all results to local FS + * data are written in a temp directory, Zip result file will be + * unzipped in the expected job directory to make them available in isis + * + * @return the directory where results for this job are stored + */ protected File downloadResults(JobDescription jobDescription) throws DisworkException { OutputStream out = null; try { + // create a temp directory to store results data File tempDir = FileUtil.createTempDirectory("isis-results-" + jobDescription.getJobName(), ""); + + // for all the result file for this job Map<String, InputStream> results = getDaemon().getResults(jobDescription); for (String fileName : results.keySet()) { + + // copy data from diswork to local FS File localFile = new File(tempDir, fileName); log.debug("downloading result in " + localFile.getAbsolutePath()); out = new FileOutputStream(localFile); - // copy data from diswork to local FS IOUtils.copy(results.get(fileName), out); + // if it's the result zip, unzip it if (fileName.endsWith(".zip")) { ZipUtil.uncompress(localFile, SimulationStorage.getSimulationDirectory()); localFile.deleteOnExit(); } } + + // delete job data (job description, input and output) from diswork getDaemon().deleteJob(jobDescription); - // FileUtil.deleteRecursively(tempDir); } catch (IOException e) { log.error("unable to write results on the local FS", e); throw new RuntimeException("unable to write results on the local FS", e); @@ -267,18 +288,21 @@ SimulationControl control) throws RemoteException { if (closed) { control.setText("unable to connect to diswork"); - + // sleep a bit before throwing exception prevent infinite loop try { Thread.sleep(1 * 1000); } catch (InterruptedException e) { - throw new RemoteException("lancher interrupted", e); + throw new RemoteException("launcher interrupted", e); } throw new RemoteException("daemon has been closed"); } + getDaemon(); + JobDescription jobDescription = jobs.get(control.getId()); if (jobDescription == null) { + // there is no such job, maybe its submission has not been terminated log.error("unknow Id" + control.getId()); } else { log.debug("updating control for " + jobDescription); @@ -322,7 +346,7 @@ try { JobDescription jobDescription = jobs.get(job.getId()); if (jobDescription == null) { - log.warn(job + " is not a know job"); + log.warn(job + " is not a known job"); } else { getDaemon().deleteJob(jobDescription); }

1 0

r3095 - isis-fish/trunk
by chatellier＠users.labs.libre-entreprise.org 23 Jul '10

23 Jul '10

Author: chatellier Date: 2010-07-23 12:52:09 +0000 (Fri, 23 Jul 2010) New Revision: 3095 Log: Update slf4j && rsyntaxtextarea Modified: isis-fish/trunk/pom.xml Modified: isis-fish/trunk/pom.xml =================================================================== --- isis-fish/trunk/pom.xml 2010-07-23 12:50:47 UTC (rev 3094) +++ isis-fish/trunk/pom.xml 2010-07-23 12:52:09 UTC (rev 3095) @@ -140,13 +140,13 @@ <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> - <version>1.5.10</version> + <version>1.6.1</version> </dependency> <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId> - <version>1.5.10</version> + <version>1.6.1</version> </dependency> <dependency> @@ -180,7 +180,7 @@ <dependency> <groupId>org.nuiton.thirdparty</groupId> <artifactId>rsyntaxtextarea</artifactId> - <version>1.4.0</version> + <version>1.4.1</version> <scope>runtime</scope> </dependency>

1 0

r3094 - in isis-fish/trunk: . src/main/java/fr/ifremer/isisfish
by chatellier＠users.labs.libre-entreprise.org 23 Jul '10

23 Jul '10

Author: chatellier Date: 2010-07-23 12:50:47 +0000 (Fri, 23 Jul 2010) New Revision: 3094 Log: Update changelog for next version Modified: isis-fish/trunk/changelog.txt isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java Modified: isis-fish/trunk/changelog.txt =================================================================== --- isis-fish/trunk/changelog.txt 2010-07-23 12:49:51 UTC (rev 3093) +++ isis-fish/trunk/changelog.txt 2010-07-23 12:50:47 UTC (rev 3094) @@ -1,3 +1,7 @@ +isis-fish (3.3.0.6) stable; urgency=low + + -- ven. juil. 23 14:24:24 CEST 2010 + isis-fish (3.3.0.5) stable; urgency=low * Fix wrong openmap version used Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2010-07-23 12:49:51 UTC (rev 3093) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2010-07-23 12:50:47 UTC (rev 3094) @@ -113,7 +113,7 @@ * migration de donnees demande automatiquement un changement de version * d'application. */ - protected final static Version version = new Version(3, 3, 0, 5); + protected final static Version version = new Version(3, 3, 0, 6); protected final static Version databaseVersion = new Version( version.getNumber(0), version.getNumber(1)); protected final static Version apiVersion = new Version(

1 0

r3093 - isis-fish/branches/3.3.0.4-disworksupport/src/main/java/fr/ifremer/isisfish/simulator/launcher
by bleny＠users.labs.libre-entreprise.org 23 Jul '10

23 Jul '10

Author: bleny Date: 2010-07-23 12:49:51 +0000 (Fri, 23 Jul 2010) New Revision: 3093 Log: bugfix, tous les jobs sont soumis avec la version courrante de isis, application soumise une seule fois au d?\195?\169marrage du d?\195?\169mon Modified: isis-fish/branches/3.3.0.4-disworksupport/src/main/java/fr/ifremer/isisfish/simulator/launcher/DisworkSimulatorLauncher.java Modified: isis-fish/branches/3.3.0.4-disworksupport/src/main/java/fr/ifremer/isisfish/simulator/launcher/DisworkSimulatorLauncher.java =================================================================== --- isis-fish/branches/3.3.0.4-disworksupport/src/main/java/fr/ifremer/isisfish/simulator/launcher/DisworkSimulatorLauncher.java 2010-07-23 12:07:37 UTC (rev 3092) +++ isis-fish/branches/3.3.0.4-disworksupport/src/main/java/fr/ifremer/isisfish/simulator/launcher/DisworkSimulatorLauncher.java 2010-07-23 12:49:51 UTC (rev 3093) @@ -39,6 +39,7 @@ LogFactory.getLog(DisworkSimulatorLauncher.class); protected static final String ISIS_APPLICATION_NAME = "isis-fish"; + protected static final String ISIS_APPLICATION_VERSION = IsisFish.config.getVersion(); protected static DisworkDaemon disworkDaemon; @@ -55,63 +56,78 @@ // isis is used on caparmor or as diswork application if (disworkDaemon == null) { - DisworkConfig config = new DisworkConfig(); - config.setBootstrapIp(IsisFish.config.getDisworkBootstrapIp()); - config.setBootstrapPort(IsisFish.config.getDisworkBootstrapPort()); - config.setUsedPort(IsisFish.config.getDisworkPort()); - - config.setActivityStrategy("unlimited"); - config.setHttpFrontendPort(8081); - try { - disworkDaemon = new DisworkDaemon(config); - } catch (DisworkException e) { - log.error("unable to boot diswork FS"); - closed = true; - throw new RemoteException("unable to boot diswork FS", e); - } - - // retrieving all jobs submitted to this daemon last time isis was run - try { - for (JobDescription job : getDaemon().getAllJobs(ISIS_APPLICATION_NAME)) { - jobs.put(job.getJobName(), job); - } - log.debug(jobs.size() + " jobs retrieved from diswork"); - } catch (DisworkException e) { - log.error("unable to boot diswork FS"); - throw new RuntimeException("unable to boot diswork FS", e); - } } return disworkDaemon; } - protected synchronized void submitIsisApplication(String isisVersion) { - // method is synchronized so two submission at the same time - // will not upload isis twice - log.info("submitting isis-fish " + isisVersion + " to diswork"); - String isisDownloadUrlOption = IsisFish.config.getDisworkIsisDownloadURL(); + protected static void initDaemon() throws RemoteException { + DisworkConfig config = new DisworkConfig(); + config.setBootstrapIp(IsisFish.config.getDisworkBootstrapIp()); + config.setBootstrapPort(IsisFish.config.getDisworkBootstrapPort()); + config.setUsedPort(IsisFish.config.getDisworkPort()); + + config.setActivityStrategy("unlimited"); + config.setHttpFrontendPort(8081); + try { + disworkDaemon = new DisworkDaemon(config); + } catch (DisworkException e) { + log.error("unable to boot diswork FS"); + closed = true; + throw new RemoteException("unable to boot diswork FS", e); + } + // retrieving all jobs submitted to this daemon last time isis was run + try { + for (JobDescription job : disworkDaemon.getAllJobs(ISIS_APPLICATION_NAME)) { + jobs.put(job.getJobName(), job); + } + log.debug(jobs.size() + " jobs retrieved from diswork"); + } catch (DisworkException e) { + log.error("unable to boot diswork FS"); + throw new RuntimeException("unable to boot diswork FS", e); + } + + + // now, checks if isis-fish in the current version is available on + // diswork for other nodes. If not, application is downloader and + // submitted + + // no exception thrown below, even if it fails we can hope that + // application is already available. If it's not the case, a + // exception will be raised at job submission URL isisDownloadUrl = null; InputStream applicationData = null; try { - isisDownloadUrl = new URL(isisDownloadUrlOption); - log.debug("downloading isis from " + isisDownloadUrl); - applicationData = isisDownloadUrl.openStream(); - getDaemon().submitApplication(ISIS_APPLICATION_NAME, - isisVersion, - applicationData); - - // no exception thrown below, even if it fails we can hope that - // application is already available. If it's not the case, a - // exception will be raised at job submission - } catch (MalformedURLException e) { - log.error("isis can't be downloaded from " + isisDownloadUrlOption - + " malformed URL", e); - } catch (IOException e) { - log.error("unable to download data from " + isisDownloadUrl, e); - IOUtils.closeQuietly(applicationData); + // submitting isis-fish application + if (disworkDaemon.isApplicationAvailable(ISIS_APPLICATION_NAME, + ISIS_APPLICATION_VERSION)) { + log.info("isis-fish " + ISIS_APPLICATION_VERSION + + " is already available on diswork"); + } else { + log.info("submitting isis-fish " + ISIS_APPLICATION_VERSION + + " to diswork"); + String isisDownloadUrlOption = + IsisFish.config.getDisworkIsisDownloadURL(); + + try { + isisDownloadUrl = new URL(isisDownloadUrlOption); + log.debug("downloading isis from " + isisDownloadUrl); + applicationData = isisDownloadUrl.openStream(); + getDaemon().submitApplication(ISIS_APPLICATION_NAME, + ISIS_APPLICATION_VERSION, + applicationData); + } catch (MalformedURLException e) { + log.error("isis can't be downloaded from " + + isisDownloadUrlOption + " malformed URL", e); + } catch (IOException e) { + log.error("unable to download data from " + isisDownloadUrl, e); + IOUtils.closeQuietly(applicationData); + } + } } catch (DisworkException e) { - log.error("unable to submit application to daemon", e); + log.error("unable to check application availability or to submit " + + "application to daemon", e); } } @@ -137,12 +153,9 @@ String simulationId = simulationItem.getControl().getId(); jobDescription.setJobName(simulationId); - // upload isis application to diswork in current version and set it - // as the application for this job - String isisVersion = simulationItem.getParameter().getIsisFishVersion(); - simulationItem.getControl().setText("uploading isis " + isisVersion); - submitIsisApplication(isisVersion); - jobDescription.setApplication(ISIS_APPLICATION_NAME, isisVersion); + // set isis current version as the application for this job + jobDescription.setApplication(ISIS_APPLICATION_NAME, + ISIS_APPLICATION_VERSION); // setting input data InputStream simulationZipData; @@ -166,8 +179,8 @@ jobDescription.addOutput(standardOutputName); // generating the command-line for this job - String isisJarPath = "isis-fish-" + isisVersion + "%sep" + "isis-fish-" + - isisVersion + ".jar"; + String isisJarPath = "isis-fish-" + ISIS_APPLICATION_VERSION + "%sep" + + "isis-fish-" + ISIS_APPLICATION_VERSION + ".jar"; String commandLine = "%java -Xmx2500M -jar" + " " + isisJarPath + " --option launch.ui false" @@ -268,7 +281,7 @@ if (jobDescription == null) { log.error("unknow Id" + control.getId()); } else { - log.info("updating control for " + jobDescription); + log.debug("updating control for " + jobDescription); try { if (getDaemon().isFinished(jobDescription)) { // downloads the results @@ -277,7 +290,15 @@ // in this dir, look for the control file File controlFile = new File(resultDir, SimulationStorage.CONTROL_FILENAME); log.debug("control file is " + controlFile.getAbsolutePath()); - SimulationStorage.readControl(controlFile, control, "stop"); + if (controlFile.exists()) { + SimulationStorage.readControl(controlFile, control, "stop"); + } else { + // job failed, no result file downloaded so no control file + log.info(jobDescription + " is failed, see " + + resultDir.getAbsolutePath() + + "content to know why"); + control.setStopSimulationRequest(true); + } } } catch (DisworkException e) { log.error("error while retrieving status|results for job", e); @@ -293,7 +314,7 @@ try { Thread.sleep(1 * 1000); } catch (InterruptedException e) { - throw new RemoteException("lancher interrupted", e); + throw new RemoteException("launcher interrupted", e); } throw new RemoteException("daemon has been closed"); } @@ -322,9 +343,9 @@ /** must be called when IsisFish is being closed */ public static void close() throws RemoteException { closed = true; - if (getDaemon() != null) { + if (disworkDaemon != null) { try { - getDaemon().close(); + disworkDaemon.close(); } catch (DisworkException e) { throw new RemoteException("unable to close daemon", e); }

1 0

r3092 - isis-fish/trunk
by chatellier＠users.labs.libre-entreprise.org 23 Jul '10

23 Jul '10

Author: chatellier Date: 2010-07-23 12:07:37 +0000 (Fri, 23 Jul 2010) New Revision: 3092 Log: [maven-release-plugin] prepare for next development iteration Modified: isis-fish/trunk/pom.xml Modified: isis-fish/trunk/pom.xml =================================================================== --- isis-fish/trunk/pom.xml 2010-07-23 12:07:34 UTC (rev 3091) +++ isis-fish/trunk/pom.xml 2010-07-23 12:07:37 UTC (rev 3092) @@ -10,7 +10,7 @@ <groupId>fr.ifremer</groupId> <artifactId>isis-fish</artifactId> - <version>3.3.0.5</version> + <version>3.3.0.6-SNAPSHOT</version>  <dependencies> @@ -657,9 +657,9 @@   <scm> - <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/isis-fish/isis-fish/tags/isis-fish-3.3.0.5</connection> - <developerConnection>scm:svn:svn+ssh://chatellier at labs.libre-entreprise.org/svnroot/isis-fish/isis-fish/tags/isis-fish-3.3.0.5</developerConnection> - <url>https://labs.libre-entreprise.org/scm/viewvc.php/isis-fish/tags/isis-fish-3…</url> + <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/isis-fish/isis-fish/trunk</connection> + <developerConnection>scm:svn:svn+ssh://chatellier at labs.libre-entreprise.org/svnroot/isis-fish/isis-fish/trunk</developerConnection> + <url>https://labs.libre-entreprise.org/scm/viewvc.php/isis-fish/trunk/?root=isis…</url> </scm> <repositories>

1 0

r3091 - isis-fish/tags
by chatellier＠users.labs.libre-entreprise.org 23 Jul '10

23 Jul '10

Author: chatellier Date: 2010-07-23 12:07:34 +0000 (Fri, 23 Jul 2010) New Revision: 3091 Log: [maven-release-plugin] copy for tag isis-fish-3.3.0.5 Added: isis-fish/tags/isis-fish-3.3.0.5/

1 0

r3090 - isis-fish/trunk
by chatellier＠users.labs.libre-entreprise.org 23 Jul '10

23 Jul '10

Author: chatellier Date: 2010-07-23 12:07:31 +0000 (Fri, 23 Jul 2010) New Revision: 3090 Log: [maven-release-plugin] prepare release isis-fish-3.3.0.5 Modified: isis-fish/trunk/pom.xml Modified: isis-fish/trunk/pom.xml =================================================================== --- isis-fish/trunk/pom.xml 2010-07-23 12:00:12 UTC (rev 3089) +++ isis-fish/trunk/pom.xml 2010-07-23 12:07:31 UTC (rev 3090) @@ -10,7 +10,7 @@ <groupId>fr.ifremer</groupId> <artifactId>isis-fish</artifactId> - <version>3.3.0.5-SNAPSHOT</version> + <version>3.3.0.5</version>  <dependencies> @@ -657,9 +657,9 @@   <scm> - <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/isis-fish/isis-fish/trunk</connection> - <developerConnection>scm:svn:svn+ssh://chatellier at labs.libre-entreprise.org/svnroot/isis-fish/isis-fish/trunk</developerConnection> - <url>https://labs.libre-entreprise.org/scm/viewvc.php/isis-fish/trunk/?root=isis…</url> + <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/isis-fish/isis-fish/tags/isis-fish-3.3.0.5</connection> + <developerConnection>scm:svn:svn+ssh://chatellier at labs.libre-entreprise.org/svnroot/isis-fish/isis-fish/tags/isis-fish-3.3.0.5</developerConnection> + <url>https://labs.libre-entreprise.org/scm/viewvc.php/isis-fish/tags/isis-fish-3…</url> </scm> <repositories>

1 0

r3089 - isis-fish/trunk
by chatellier＠users.labs.libre-entreprise.org 23 Jul '10

23 Jul '10

Author: chatellier Date: 2010-07-23 12:00:12 +0000 (Fri, 23 Jul 2010) New Revision: 3089 Log: Update changelog Modified: isis-fish/trunk/changelog.txt Modified: isis-fish/trunk/changelog.txt =================================================================== --- isis-fish/trunk/changelog.txt 2010-07-22 12:15:31 UTC (rev 3088) +++ isis-fish/trunk/changelog.txt 2010-07-23 12:00:12 UTC (rev 3089) @@ -1,7 +1,9 @@ isis-fish (3.3.0.5) stable; urgency=low - -- jeu. juil. 22 09:32:36 CEST 2010 + * Fix wrong openmap version used + -- ven. juil. 23 14:24:24 CEST 2010 + isis-fish (3.3.0.4) stable; urgency=low * Add more startup information in debug.txt file (arch, R_HOME, PATH)

1 0

r3088 - isis-fish/branches/3.3.0.4-disworksupport/src/main/java/fr/ifremer/isisfish/simulator/launcher
by bleny＠users.labs.libre-entreprise.org 22 Jul '10

22 Jul '10

Author: bleny Date: 2010-07-22 12:15:31 +0000 (Thu, 22 Jul 2010) New Revision: 3088 Log: logs Modified: isis-fish/branches/3.3.0.4-disworksupport/src/main/java/fr/ifremer/isisfish/simulator/launcher/DisworkSimulatorLauncher.java Modified: isis-fish/branches/3.3.0.4-disworksupport/src/main/java/fr/ifremer/isisfish/simulator/launcher/DisworkSimulatorLauncher.java =================================================================== --- isis-fish/branches/3.3.0.4-disworksupport/src/main/java/fr/ifremer/isisfish/simulator/launcher/DisworkSimulatorLauncher.java 2010-07-22 09:51:37 UTC (rev 3087) +++ isis-fish/branches/3.3.0.4-disworksupport/src/main/java/fr/ifremer/isisfish/simulator/launcher/DisworkSimulatorLauncher.java 2010-07-22 12:15:31 UTC (rev 3088) @@ -268,6 +268,7 @@ if (jobDescription == null) { log.error("unknow Id" + control.getId()); } else { + log.info("updating control for " + jobDescription); try { if (getDaemon().isFinished(jobDescription)) { // downloads the results

1 0

r3087 - in isis-fish/branches/3.3.0.4-disworksupport/src/main: java/fr/ifremer/isisfish java/fr/ifremer/isisfish/simulator/launcher resources
by bleny＠users.labs.libre-entreprise.org 22 Jul '10

22 Jul '10

Author: bleny Date: 2010-07-22 09:51:37 +0000 (Thu, 22 Jul 2010) New Revision: 3087 Log: bugfix, t?\195?\169l?\195?\169chargement de isis depuis le web Modified: isis-fish/branches/3.3.0.4-disworksupport/src/main/java/fr/ifremer/isisfish/IsisConfig.java isis-fish/branches/3.3.0.4-disworksupport/src/main/java/fr/ifremer/isisfish/simulator/launcher/DisworkSimulatorLauncher.java isis-fish/branches/3.3.0.4-disworksupport/src/main/resources/log4j.properties Modified: isis-fish/branches/3.3.0.4-disworksupport/src/main/java/fr/ifremer/isisfish/IsisConfig.java =================================================================== --- isis-fish/branches/3.3.0.4-disworksupport/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2010-07-22 07:44:45 UTC (rev 3086) +++ isis-fish/branches/3.3.0.4-disworksupport/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2010-07-22 09:51:37 UTC (rev 3087) @@ -632,6 +632,10 @@ public void setDisworkBootstrapPort(String ip) { setOption(Option.SIMULATOR_DISWORK_BOOTSTRAP_IP.key, ip); } + + public String getDisworkIsisDownloadURL() { + return getOption(Option.SIMULATOR_DISWORK_ISIS_DOWNLOAD_URL.key); + } /** * Get launch.ui option value. @@ -926,6 +930,10 @@ "projectName", null, "simulationReportMail", null, + // allways use the default value to prevent the download of a too old version + // due to a remaining value in the user config file + "simulation.diswork.isis_download_url", null, + }; if (log.isInfoEnabled()) { @@ -1019,6 +1027,7 @@ SIMULATOR_DISWORK_BOOTSTRAP_IP("simulation.diswork.bootstrap.ip", _("isisfish.config.main.simulation.diswork.bootstrap.ip.description"), ""), SIMULATOR_DISWORK_BOOTSTRAP_PORT("simulation.diswork.bootstrap.port", _("isisfish.config.main.simulation.diswork.bootstrap.port.description"), "19000"), SIMULATOR_DISWORK_PORT("simulation.diswork.port", _("isisfish.config.main.simulation.diswork.port.description"), "19000"), + SIMULATOR_DISWORK_ISIS_DOWNLOAD_URL("simulation.diswork.isis_download_url", _("isisfish.config.main.simulation.diswork.isis_download_url.description"), "http://isis-fish.labs.libre-entreprise.org/download/version3/isis-fish-" + getVersion() + "-bin.zip"), /** Application locale (for i18n init). */ LOCALE("locale", _("isisfish.config.main.locale.description"), "fr_FR"), Modified: isis-fish/branches/3.3.0.4-disworksupport/src/main/java/fr/ifremer/isisfish/simulator/launcher/DisworkSimulatorLauncher.java =================================================================== --- isis-fish/branches/3.3.0.4-disworksupport/src/main/java/fr/ifremer/isisfish/simulator/launcher/DisworkSimulatorLauncher.java 2010-07-22 07:44:45 UTC (rev 3086) +++ isis-fish/branches/3.3.0.4-disworksupport/src/main/java/fr/ifremer/isisfish/simulator/launcher/DisworkSimulatorLauncher.java 2010-07-22 09:51:37 UTC (rev 3087) @@ -51,6 +51,9 @@ public DisworkSimulatorLauncher() {} protected synchronized static DisworkDaemon getDaemon() throws RemoteException { + // lazy creation of the daemon. Thus, daemon will not be run when + // isis is used on caparmor or as diswork application + if (disworkDaemon == null) { DisworkConfig config = new DisworkConfig(); config.setBootstrapIp(IsisFish.config.getDisworkBootstrapIp()); @@ -67,6 +70,7 @@ throw new RemoteException("unable to boot diswork FS", e); } + // retrieving all jobs submitted to this daemon last time isis was run try { for (JobDescription job : getDaemon().getAllJobs(ISIS_APPLICATION_NAME)) { jobs.put(job.getJobName(), job); @@ -81,28 +85,40 @@ return disworkDaemon; } - // TODO 20100628 bleny upload application if needed, whatever the version protected synchronized void submitIsisApplication(String isisVersion) { // method is synchronized so two submission at the same time // will not upload isis twice + log.info("submitting isis-fish " + isisVersion + " to diswork"); + String isisDownloadUrlOption = IsisFish.config.getDisworkIsisDownloadURL(); + + URL isisDownloadUrl = null; + InputStream applicationData = null; try { - log.info("submitting isis-fish " + isisVersion + " to diswork"); - URL url = new URL("http://isis-fish.labs.libre-entreprise.org/download/version3/isis-fish-3.3.…"); + isisDownloadUrl = new URL(isisDownloadUrlOption); + log.debug("downloading isis from " + isisDownloadUrl); + applicationData = isisDownloadUrl.openStream(); getDaemon().submitApplication(ISIS_APPLICATION_NAME, - isisVersion, - url.openStream()); + isisVersion, + applicationData); + + // no exception thrown below, even if it fails we can hope that + // application is already available. If it's not the case, a + // exception will be raised at job submission } catch (MalformedURLException e) { - // hardcoded URL cannot be malformed + log.error("isis can't be downloaded from " + isisDownloadUrlOption + + " malformed URL", e); + } catch (IOException e) { + log.error("unable to download data from " + isisDownloadUrl, e); + IOUtils.closeQuietly(applicationData); } catch (DisworkException e) { - log.error("error while submitting application ", e); - } catch (IOException e) { - log.error("error while submitting application ", e); + log.error("unable to submit application to daemon", e); } } @Override public void simulate(SimulationService simulationService, SimulationItem simulationItem) throws RemoteException { + // check if daemon is available if (closed) { simulationItem.getControl().setText("unable to connect to diswork"); simulationItem.getControl().setStopSimulationRequest(true); @@ -116,19 +132,19 @@ throw new RemoteException("daemon has been closed"); } - + // creating a new job JobDescription jobDescription = new JobDescription(); String simulationId = simulationItem.getControl().getId(); jobDescription.setJobName(simulationId); - // TODO 20100702 bleny use isisVersion - // String isisVersion = simulationItem.getParameter().getIsisFishVersion(); - String isisVersion = "3.3.0.4-SNAPSHOT"; - + // upload isis application to diswork in current version and set it + // as the application for this job + String isisVersion = simulationItem.getParameter().getIsisFishVersion(); simulationItem.getControl().setText("uploading isis " + isisVersion); submitIsisApplication(isisVersion); jobDescription.setApplication(ISIS_APPLICATION_NAME, isisVersion); + // setting input data InputStream simulationZipData; try { simulationZipData = new FileInputStream(simulationItem.getSimulationZip()); @@ -139,10 +155,17 @@ } String simulationZipName = "simulation-" + simulationId + "-preparation.zip"; jobDescription.addInput(simulationZipName, simulationZipData); - + + // setting output data String resultZipName = "simulation-" + simulationId + "-result.zip"; jobDescription.addOutput(resultZipName); + + // setting standard output + String standardOutputName = "simulation-" + simulationId + "-output.txt"; + jobDescription.setStandardOutput(standardOutputName); + jobDescription.addOutput(standardOutputName); + // generating the command-line for this job String isisJarPath = "isis-fish-" + isisVersion + "%sep" + "isis-fish-" + isisVersion + ".jar"; String commandLine = "%java -Xmx2500M -jar" @@ -156,18 +179,16 @@ + " " + simulationZipName + " " + resultZipName; jobDescription.setCommandLine(commandLine); - - String standardOutputName = "simulation-" + simulationId + "-output.txt"; - jobDescription.setStandardOutput(standardOutputName); - jobDescription.addOutput(standardOutputName); - jobs.put(simulationId, jobDescription); - + // finally, submit the job try { log.info("submitting job " + jobDescription.toJSDL()); simulationItem.getControl().setText("submitting job"); getDaemon().submitJob(jobDescription); simulationItem.getControl().setText("job submitted"); + + // adding this job to known job + jobs.put(simulationId, jobDescription); } catch (DisworkException e) { log.error("error while submiting job to diswork", e); throw new RemoteException("error while submiting job to diswork", e); @@ -181,7 +202,7 @@ @Override public int getCheckProgressionInterval() { - return 15; + return 15; // 15 seconds } @Override @@ -201,22 +222,22 @@ OutputStream out = null; try { File tempDir = FileUtil.createTempDirectory("isis-results-" + - jobDescription.getJobName(), null); + jobDescription.getJobName(), ""); Map<String, InputStream> results = getDaemon().getResults(jobDescription); for (String fileName : results.keySet()) { File localFile = new File(tempDir, fileName); - localFile.deleteOnExit(); - log.debug("downloading results in " + localFile.getAbsolutePath()); + log.debug("downloading result in " + localFile.getAbsolutePath()); out = new FileOutputStream(localFile); // copy data from diswork to local FS IOUtils.copy(results.get(fileName), out); if (fileName.endsWith(".zip")) { ZipUtil.uncompress(localFile, SimulationStorage.getSimulationDirectory()); + localFile.deleteOnExit(); } } - // getDaemon().deleteJob(jobDescription); - FileUtil.deleteRecursively(tempDir); + getDaemon().deleteJob(jobDescription); + // FileUtil.deleteRecursively(tempDir); } catch (IOException e) { log.error("unable to write results on the local FS", e); throw new RuntimeException("unable to write results on the local FS", e); @@ -251,6 +272,8 @@ if (getDaemon().isFinished(jobDescription)) { // downloads the results File resultDir = downloadResults(jobDescription); + + // in this dir, look for the control file File controlFile = new File(resultDir, SimulationStorage.CONTROL_FILENAME); log.debug("control file is " + controlFile.getAbsolutePath()); SimulationStorage.readControl(controlFile, control, "stop"); Modified: isis-fish/branches/3.3.0.4-disworksupport/src/main/resources/log4j.properties =================================================================== --- isis-fish/branches/3.3.0.4-disworksupport/src/main/resources/log4j.properties 2010-07-22 07:44:45 UTC (rev 3086) +++ isis-fish/branches/3.3.0.4-disworksupport/src/main/resources/log4j.properties 2010-07-22 09:51:37 UTC (rev 3087) @@ -19,6 +19,7 @@ log4j.logger.simulators=INFO # diswork +log4j.logger.fr.ifremer.isisfish.simulator.launcher.DisworkSimulatorLauncher=DEBUG log4j.logger.org.nuiton.diswork.daemon=DEBUG log4j.logger.org.nuiton.diswork.fs=INFO log4j.logger.org.planx.xmlstore=WARN \ No newline at end of file

1 0