addressing-devel Mailing List for Addressing (Page 2)
Brought to you by:
nodens2k
Menu
▾
▴
addressing-devel — For developers and commit notifications
You can subscribe to this list here.
| 2008 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(1) |
Sep
(96) |
Oct
|
Nov
|
Dec
|
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2009 |
Jan
(3) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Gridsystems C. <gsc...@us...> - 2008-09-03 21:27:55
|
Update of /cvsroot/fura/FuraSrc/Server/ServerTestsuite In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv8372/FuraSrc/Server/ServerTestsuite Modified Files: tag.txt Log Message: cvssync-20080903232636 Index: tag.txt =================================================================== RCS file: /cvsroot/fura/FuraSrc/Server/ServerTestsuite/tag.txt,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** tag.txt 27 Aug 2008 19:29:00 -0000 1.9 --- tag.txt 3 Sep 2008 21:27:23 -0000 1.10 *************** *** 1 **** ! V_1_3_70 \ No newline at end of file --- 1 ---- ! V_1_3_78 \ No newline at end of file |
|
From: Gridsystems C. <gsc...@us...> - 2008-09-03 21:27:54
|
Update of /cvsroot/fura/FuraSrc/Server/Plugins/ResourcePlugin/plugin/src/com/gridsystems/resource/internal/utils In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv8372/FuraSrc/Server/Plugins/ResourcePlugin/plugin/src/com/gridsystems/resource/internal/utils Modified Files: CaseInsensitiveResourceIdComparator.java ResourceStats.java Log Message: cvssync-20080903232636 Index: ResourceStats.java =================================================================== RCS file: /cvsroot/fura/FuraSrc/Server/Plugins/ResourcePlugin/plugin/src/com/gridsystems/resource/internal/utils/ResourceStats.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** ResourceStats.java 16 Jul 2008 06:55:47 -0000 1.3 --- ResourceStats.java 3 Sep 2008 21:27:22 -0000 1.4 *************** *** 35,39 **** * Keeps some statistics from the server usage. * ! * @version 2.0 */ public final class ResourceStats { --- 35,39 ---- * Keeps some statistics from the server usage. * ! * @version $Revision$ */ public final class ResourceStats { Index: CaseInsensitiveResourceIdComparator.java =================================================================== RCS file: /cvsroot/fura/FuraSrc/Server/Plugins/ResourcePlugin/plugin/src/com/gridsystems/resource/internal/utils/CaseInsensitiveResourceIdComparator.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** CaseInsensitiveResourceIdComparator.java 13 Mar 2008 08:24:03 -0000 1.1 --- CaseInsensitiveResourceIdComparator.java 3 Sep 2008 21:27:22 -0000 1.2 *************** *** 23,27 **** * Compares two resourceids lexicographically, ignoring case considerations. * ! * @author M Antònia Tugores (Grid Systems, 2006) * @version 1.0 */ --- 23,27 ---- * Compares two resourceids lexicographically, ignoring case considerations. * ! * @author Antonia Tugores * @version 1.0 */ |
|
From: Gridsystems C. <gsc...@us...> - 2008-09-03 21:27:54
|
Update of /cvsroot/fura/FuraSrc/common/KernelCommon In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv8372/FuraSrc/common/KernelCommon Modified Files: tag.txt Log Message: cvssync-20080903232636 Index: tag.txt =================================================================== RCS file: /cvsroot/fura/FuraSrc/common/KernelCommon/tag.txt,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** tag.txt 27 Aug 2008 19:29:00 -0000 1.9 --- tag.txt 3 Sep 2008 21:27:23 -0000 1.10 *************** *** 1 **** ! V_1_3_65 \ No newline at end of file --- 1 ---- ! V_1_3_70 \ No newline at end of file |
|
From: Gridsystems C. <gsc...@us...> - 2008-09-03 21:27:53
|
Update of /cvsroot/fura/FuraSrc/common/TestsuiteUtils/src/com/gridsystems/testsuite/junit/cl In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv8372/FuraSrc/common/TestsuiteUtils/src/com/gridsystems/testsuite/junit/cl Modified Files: TestRunner.java Log Message: cvssync-20080903232636 Index: TestRunner.java =================================================================== RCS file: /cvsroot/fura/FuraSrc/common/TestsuiteUtils/src/com/gridsystems/testsuite/junit/cl/TestRunner.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** TestRunner.java 16 Jul 2008 06:56:22 -0000 1.3 --- TestRunner.java 3 Sep 2008 21:27:23 -0000 1.4 *************** *** 17,23 **** package com.gridsystems.testsuite.junit.cl; - import java.io.ByteArrayOutputStream; import java.io.File; - import java.io.PrintStream; import java.text.DateFormat; import java.text.DecimalFormat; --- 17,21 ---- *************** *** 28,32 **** import java.util.Hashtable; import java.util.ResourceBundle; - import java.util.StringTokenizer; import java.util.List; import java.util.Vector; --- 26,29 ---- *************** *** 69,72 **** --- 66,70 ---- * * @author Job Torres + * @author jrossello * @version 1.0 */ *************** *** 141,146 **** * Send a mail with the results. */ - protected boolean sendMail = false; /** * Verbose log to System.out. --- 139,154 ---- * Send a mail with the results. */ protected boolean sendMail = false; + + /** + * Send extra logs as attached files. + */ + protected boolean sendLogs = false; + + /** + * Extra logs to attach to the mail. + */ + protected ArrayList<String> extraLogs = new ArrayList<String>(); + /** * Verbose log to System.out. *************** *** 860,863 **** --- 868,883 ---- String logFileName = Logger.getLogLevelLiteral(this.logLevel) + ".html"; String[] logFiles = new String[] {LOGS_DIR + logFileName}; + + // if extra logs have to be send, add them to the log files + if (extraLogs.size() > 0) { + String[] aux = new String[extraLogs.size()]; + extraLogs.toArray(aux); + logFiles = new String[extraLogs.size() + 1]; + logFiles[0] = LOGS_DIR + logFileName; + for (int i = 0; i < aux.length; i++) { + logFiles[i + 1] = aux[i]; + } + } + String from = "tes...@gr..."; boolean passed = this.result.wasSuccessful(); |
|
From: Gridsystems C. <gsc...@us...> - 2008-09-03 21:27:53
|
Update of /cvsroot/fura/FuraSrc/Server/Plugins/ShellPlugin/brokerplugin/src/com/gridsystems/shellbroker/internal/api In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv8372/FuraSrc/Server/Plugins/ShellPlugin/brokerplugin/src/com/gridsystems/shellbroker/internal/api Modified Files: ApiShellBrokerImpl.java ShellBrokerUtils.java ShellExecutorList.java ShellExecutorWatchDog.java Log Message: cvssync-20080903232636 Index: ApiShellBrokerImpl.java =================================================================== RCS file: /cvsroot/fura/FuraSrc/Server/Plugins/ShellPlugin/brokerplugin/src/com/gridsystems/shellbroker/internal/api/ApiShellBrokerImpl.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ApiShellBrokerImpl.java 23 Jul 2008 09:58:30 -0000 1.2 --- ApiShellBrokerImpl.java 3 Sep 2008 21:27:22 -0000 1.3 *************** *** 32,35 **** --- 32,36 ---- import com.gridsystems.innergrid.kernel.KernelException; import com.gridsystems.innergrid.kernel.server.ApiServerFactory; + import com.gridsystems.module.api.DownloadPolicy; import com.gridsystems.resource.ResourcePlugin; import com.gridsystems.resource.api.ApiResourceManager; *************** *** 229,232 **** --- 230,234 ---- ResourceProperties resProp; if (isNew) { + // New Shell Executor, it was not registered before shellexec = new Resource(); *************** *** 239,242 **** --- 241,247 ---- shellexec.setProperties(resProp); + // Save Resource + apires.addResource(shellexec); + } else { resProp = getResourceProperties(info, executionType); *************** *** 247,258 **** if (shellexec.getProperties().getState() != ResourceProperties.STATE_DISABLED) { resProp.setState(ResourceProperties.STATE_ACTIVE); } resProp.setUploadBandwidth(shellexec.getProperties().getUploadBandwidth()); resProp.setDownloadBandwidth(shellexec.getProperties().getDownloadBandwidth()); shellexec.setProperties(resProp); - } ! // Save Resource ! apires.addResource(shellexec); ShellExecutor shell = ShellExecutorList.getInstance().get(shellName); --- 252,264 ---- if (shellexec.getProperties().getState() != ResourceProperties.STATE_DISABLED) { resProp.setState(ResourceProperties.STATE_ACTIVE); + } else { + resProp.setState(shellexec.getProperties().getState()); } resProp.setUploadBandwidth(shellexec.getProperties().getUploadBandwidth()); resProp.setDownloadBandwidth(shellexec.getProperties().getDownloadBandwidth()); shellexec.setProperties(resProp); ! apires.updateResourceProperties(resId, resProp, true); ! } ShellExecutor shell = ShellExecutorList.getInstance().get(shellName); *************** *** 304,308 **** resProp.setCpus(new CPU[]{info.getCpu()}); resProp.setOss(new OS[] { info.getOs() }); ! resProp.setKeywords(null); break; default: --- 310,314 ---- resProp.setCpus(new CPU[]{info.getCpu()}); resProp.setOss(new OS[] { info.getOs() }); ! resProp.setKeywords(new String[0]); break; default: *************** *** 322,326 **** resProp.setMegaFlops(DEFAULT_MAINTENANCE_FACTOR * info.getMegaFlops()); resProp.setMemory(info.getMemory()); - resProp.setKeywords(new String[0]); resProp.setState(ResourceProperties.STATE_ACTIVE); --- 328,331 ---- *************** *** 329,332 **** --- 334,341 ---- resProp.setVersion(info.getVersion()); resProp.setOnOverloadPolicy(ResourceProperties.ON_OVERLOAD_IGNORE); + + // @todo Case 11073 + resProp.setSupportedResultFilterPolicies(new String[]{DownloadPolicy.POLICY_FINAL}); + return resProp; } Index: ShellExecutorList.java =================================================================== RCS file: /cvsroot/fura/FuraSrc/Server/Plugins/ShellPlugin/brokerplugin/src/com/gridsystems/shellbroker/internal/api/ShellExecutorList.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ShellExecutorList.java 16 Jul 2008 06:55:51 -0000 1.1 --- ShellExecutorList.java 3 Sep 2008 21:27:22 -0000 1.2 *************** *** 352,356 **** ShellBrokerUtils.markShellExecutorFree(resId); */ ! ShellExecutorWatchDog.awake(); //ShellBrokerUtils.assignWorkToShellExecutor(resId, apiShell); } --- 352,356 ---- ShellBrokerUtils.markShellExecutorFree(resId); */ ! ShellExecutorWatchDog.awake(resId); //ShellBrokerUtils.assignWorkToShellExecutor(resId, apiShell); } *************** *** 377,387 **** apiShell.cancelAssignment(ra); } catch (Exception e) { log.warn("Error while it tries cancel micro-task " + ra.getMicroTask() + " of task " + ra.getTask() + " in Shell Executor " + name, e); ! return; } // Find work for this Shell Executor ShellBrokerUtils.markShellExecutorFree(resId); ! ShellBrokerUtils.assignWorkToShellExecutor(resId, apiShell); } } --- 377,399 ---- apiShell.cancelAssignment(ra); } catch (Exception e) { + boolean doReturn = true; + if (e instanceof KernelException) { + KernelException ke = (KernelException)e; + // SHE002: This shell executor is not processing the microtask + if ("SHE002".equals(ke.getCode())) { + doReturn = false; + } + } log.warn("Error while it tries cancel micro-task " + ra.getMicroTask() + " of task " + ra.getTask() + " in Shell Executor " + name, e); ! if (doReturn) { ! return; ! } } // Find work for this Shell Executor ShellBrokerUtils.markShellExecutorFree(resId); ! //ShellBrokerUtils.assignWorkToShellExecutor(resId, apiShell); ! // To avoid deadlock, better to use this command. ! ShellExecutorWatchDog.awake(resId); } } *************** *** 572,576 **** if (arg0.getNewState() == TaskInfo.STATE_INPROGRESS) { log.debug("Calling from awake: " + arg0.getSource()); ! ShellExecutorWatchDog.awake(); } } --- 584,588 ---- if (arg0.getNewState() == TaskInfo.STATE_INPROGRESS) { log.debug("Calling from awake: " + arg0.getSource()); ! ShellExecutorWatchDog.awake(null); } } Index: ShellExecutorWatchDog.java =================================================================== RCS file: /cvsroot/fura/FuraSrc/Server/Plugins/ShellPlugin/brokerplugin/src/com/gridsystems/shellbroker/internal/api/ShellExecutorWatchDog.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ShellExecutorWatchDog.java 16 Jul 2008 06:55:51 -0000 1.1 --- ShellExecutorWatchDog.java 3 Sep 2008 21:27:22 -0000 1.2 *************** *** 19,22 **** --- 19,24 ---- import java.rmi.RemoteException; + import java.util.HashSet; + import java.util.Set; import org.apache.log4j.Logger; *************** *** 68,72 **** * The Shell Executor watchdog instance. */ ! private static ShellExecutorWatchDog watchdog = null;; --- 70,79 ---- * The Shell Executor watchdog instance. */ ! private static ShellExecutorWatchDog watchdog = null; ! ! /** ! * Place to store shell resources notifications. ! */ ! private final Set<ResourceId> notificationsList = new HashSet<ResourceId>(); *************** *** 83,90 **** /** * Sets timed out shell executors to <code>STATE_TIMEDOUT</code> state. ! * * @throws RemoteException if error */ ! private void doTimeoutShellExecutors() throws Exception { if (ShellExecutorList.getInstance().getCount() == 0) { return; --- 90,99 ---- /** * Sets timed out shell executors to <code>STATE_TIMEDOUT</code> state. ! * @param shells Shells that have requested work. ! * null if all need check if must work * @throws RemoteException if error */ ! private static void doTimeoutShellExecutors(ResourceId[] shells) ! throws RemoteException { if (ShellExecutorList.getInstance().getCount() == 0) { return; *************** *** 93,97 **** ApiResourceQuery api = ApiServerFactory.newApi(ApiResourceQuery.class); ApiShellExecutor apiShell; ! Resource[] resources = api.getAllResources(ApiShellBroker.RESOURCE_SHELL_FILTER); ApiDispatcher apiDisp = ApiServerFactory.newApi(ApiDispatcher.class); --- 102,107 ---- ApiResourceQuery api = ApiServerFactory.newApi(ApiResourceQuery.class); ApiShellExecutor apiShell; ! String filter = createFilter(shells); ! Resource[] resources = api.getAllResources(filter); ApiDispatcher apiDisp = ApiServerFactory.newApi(ApiDispatcher.class); *************** *** 105,108 **** --- 115,119 ---- log.debug(i + "/" + resources.length + " Checking Shell Executor " + name); } + // 1.- Getting instance of ApiShell ResourceProperties resProp2 = r.getProperties(); int state = resProp2.getState(); *************** *** 110,163 **** apiShell = ShellBrokerUtils.getInstanceOfApiShell(name); } catch (Exception ex) { ! if (state == ResourceProperties.STATE_DISABLED) { ! continue; ! } else { ! state = ResourceProperties.STATE_DISABLED; ! apiShell = null; ! log.warn(ex.getMessage(), ex); } } ! if (apiShell != null) { ! // Update Information of Shell Executor in Resource List. ! try { ! // Update ResourceProperties Bean ! Status status = apiShell.checkStatus(r.getId()); ! updateResourceFromStatusBean(apiMan, r.getId(), status); ! ! // Check if this Shell Executor is Free ! AssignmentStatus[] resAssign = status.getCurrentAssignments(); ! if ((resAssign == null) || (resAssign.length == 0) ! || r.getUsage().isMoreAssignmentsAccepted()) { ! isFree = true; ! } else { ! // Update Assignment Status ! try { ! for (int j = 0; j < resAssign.length; j++) { ! apiDisp.updateAssignmentStatus(resAssign[j]); ! } ! } catch (Exception e) { ! log.warn("Error updating shell executor assignment state", e); ! } ! } ! } catch (NullPointerException npe) { ! log.error("Null pointer exception: ", npe); ! return; ! } catch (Exception e) { ! if (state != ResourceProperties.STATE_DISABLED) { ! log.warn("Cannot connect with Shell Executor " ! + r.getId().getResourceName() ! + ". Set to Disabled state.", e); ! state = ResourceProperties.STATE_DISABLED; ! } } } ! ! if (state == ResourceProperties.STATE_DISABLED) { continue; } ! ! // Call to API to Update Shell state. ! if (state != resProp2.getState()) { ! updateShellExecutorState(apiMan, r.getId(), state); } if (log.isDebugEnabled()) { --- 121,171 ---- apiShell = ShellBrokerUtils.getInstanceOfApiShell(name); } catch (Exception ex) { ! log.error("Unknown error getting instance of ApiShell for " + name, ex); ! continue; ! } ! // At this point, apiShell never can be null. ! // 2.- Check connection with Shell ! Status status = null; ! ResourceId resId = r.getId(); ! try { ! status = apiShell.checkStatus(resId); ! } catch (RemoteException e) { ! if (state != ResourceProperties.STATE_TIMEDOUT) { ! log.warn("Cannot connect with shell " + resId + ":" + e.getMessage(), e); ! // Set state to Timeout ! updateShellExecutorState(apiMan, r.getId(), ResourceProperties.STATE_TIMEDOUT); } + continue; } ! // 3.-Update Information of Shell Executor in Resource List. ! try { ! // Update ResourceProperties Bean ! updateResourceFromStatusBean(apiMan, r, status); ! } catch (RemoteException e) { ! if (state != ResourceProperties.STATE_TIMEDOUT) { ! log.warn("Cannot connect with Shell Executor " ! + r.getId() + ". Set to Timeout state.", e); ! state = ResourceProperties.STATE_TIMEDOUT; } } ! if (r.getProperties().getState() == ResourceProperties.STATE_DISABLED) { continue; } ! // 4.- Check if this Shell Executor is Free ! AssignmentStatus[] resAssign = status.getCurrentAssignments(); ! if ((resAssign == null) || (resAssign.length == 0)) { ! isFree = true; ! } else { ! // Update Assignment Status ! for (int j = 0; j < resAssign.length; j++) { ! try { ! apiDisp.updateAssignmentStatus(resAssign[j]); ! } catch (RemoteException e) { ! log.warn("Error updating shell assignment state: " + resAssign[j], e); ! } ! } ! if (r.getUsage().isMoreAssignmentsAccepted()) { ! isFree = true; ! } } if (log.isDebugEnabled()) { *************** *** 166,170 **** if (isFree) { // Find work for this Shell Executor - ResourceId resId = r.getId(); ShellBrokerUtils.markShellExecutorFree(resId); ShellBrokerUtils.assignWorkToShellExecutor(resId, apiShell); --- 174,177 ---- *************** *** 175,178 **** --- 182,211 ---- /** + * Create filter of shell resources. + * @param shells List of shell to create filter. Null for all shell resources. + * @return Generated filter. + */ + private static String createFilter(ResourceId[] shells) { + String filter; + if (shells == null) { + filter = ApiShellBroker.RESOURCE_SHELL_FILTER; + } else { + StringBuffer filterBuf = new StringBuffer(); + for (int i = 0; i < shells.length; i++) { + ResourceId resId = shells[i]; + if (i > 0) { + filterBuf.append(" OR "); + } + filterBuf.append("( Id.ResourceName='").append(resId.getResourceName()); + filterBuf.append("' AND Id.ResourceType='").append(resId.getResourceType()); + filterBuf.append("' )"); + } + filter = filterBuf.toString(); + } + // @todo Add to filter Active_State + return filter; + } + + /** * Update state of Resource. * @param apiMan ApiResourceManager instance *************** *** 181,185 **** * @throws RemoteException If error */ ! private void updateShellExecutorState(ApiResourceManager apiMan, ResourceId id, int state) throws RemoteException { try { --- 214,218 ---- * @throws RemoteException If error */ ! private static void updateShellExecutorState(ApiResourceManager apiMan, ResourceId id, int state) throws RemoteException { try { *************** *** 198,202 **** * @param api Instance of ApiResourceQuery */ ! private void printAllResources(ApiResourceQuery api) { try { Resource[] res = api.getAllResources(null); --- 231,235 ---- * @param api Instance of ApiResourceQuery */ ! private static void printAllResources(ApiResourceQuery api) { try { Resource[] res = api.getAllResources(null); *************** *** 218,226 **** * Update information of ShellExecutor. * @param apiMan Instance of ApiResourceManager ! * @param id resource Identifier. * @param status Information sent by Shell Executor. */ ! private void updateResourceFromStatusBean(ApiResourceManager apiMan, ! ResourceId id, Status status) throws RemoteException { // Update Resource Properties ResourceProperties resProp = new ResourceProperties(); --- 251,260 ---- * Update information of ShellExecutor. * @param apiMan Instance of ApiResourceManager ! * @param res resource Identifier. * @param status Information sent by Shell Executor. */ ! private static void updateResourceFromStatusBean(ApiResourceManager apiMan, ! Resource res, Status status) throws RemoteException { ! ResourceId id = res.getId(); // Update Resource Properties ResourceProperties resProp = new ResourceProperties(); *************** *** 234,241 **** } CPU[] cpus = resProp.getCpus(); ! for (int j = 0; j < cpus.length; j++) { ! cpus[j].setUsagePercent(status.getCpuUsage()); } - apiMan.updateResourceProperties(id, resProp, true); } --- 268,279 ---- } CPU[] cpus = resProp.getCpus(); ! if (cpus != null) { ! for (int j = 0; j < cpus.length; j++) { ! cpus[j].setUsagePercent(status.getCpuUsage()); ! } ! } ! if (res.getProperties().getState() == ResourceProperties.STATE_TIMEDOUT) { ! resProp.setState(ResourceProperties.STATE_ACTIVE); } apiMan.updateResourceProperties(id, resProp, true); } *************** *** 269,275 **** this.wait(WAIT_TIME); } long id = (System.currentTimeMillis() / THOUSANDS_LONG) % TEN_THOUSANDS_LONG; log.debug("Checking system (" + id + ")..."); ! doTimeoutShellExecutors(); log.debug("System revised (" + id + "). "); --- 307,325 ---- this.wait(WAIT_TIME); } + if (this.isInterrupted()) { + break; + } + ResourceId[] shells = null; + synchronized (this.notificationsList) { + int size = notificationsList.size(); + if (size > 0) { + shells = notificationsList.toArray(new ResourceId[size]); + notificationsList.clear(); + } + } + long id = (System.currentTimeMillis() / THOUSANDS_LONG) % TEN_THOUSANDS_LONG; log.debug("Checking system (" + id + ")..."); ! doTimeoutShellExecutors(shells); log.debug("System revised (" + id + "). "); *************** *** 299,304 **** /** * Forces the thread to wake up. */ ! public synchronized void internalAwake() { this.notifyAll(); } --- 349,360 ---- /** * Forces the thread to wake up. + * @param resId Shell Resource that has produced this event. Null for all shells. */ ! public synchronized void internalAwake(ResourceId resId) { ! if (resId != null) { ! synchronized (this.notificationsList) { ! this.notificationsList.add(resId); ! } ! } this.notifyAll(); } *************** *** 310,314 **** public void interrupt() { super.interrupt(); ! internalAwake(); } --- 366,370 ---- public void interrupt() { super.interrupt(); ! internalAwake(null); } *************** *** 336,343 **** /** * Forces the thread to wake up. */ ! public static void awake() { if (watchdog != null) { ! watchdog.internalAwake(); } } --- 392,400 ---- /** * Forces the thread to wake up. + * @param resId Shell Resource that has produced this event. Null for all shells. */ ! public static void awake(ResourceId resId) { if (watchdog != null) { ! watchdog.internalAwake(resId); } } Index: ShellBrokerUtils.java =================================================================== RCS file: /cvsroot/fura/FuraSrc/Server/Plugins/ShellPlugin/brokerplugin/src/com/gridsystems/shellbroker/internal/api/ShellBrokerUtils.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ShellBrokerUtils.java 16 Jul 2008 06:55:51 -0000 1.1 --- ShellBrokerUtils.java 3 Sep 2008 21:27:22 -0000 1.2 *************** *** 243,250 **** try { Connection con = ShellBrokerUtils.getConnection(sh); ! apiShell = (ApiShellExecutor) ApiFactory.newApi(ApiShellExecutor.class, con); } catch (Exception e) { throw new Exception("Error while it tries create instance of ApiShellExecutor", e); } return apiShell; } --- 243,254 ---- try { Connection con = ShellBrokerUtils.getConnection(sh); ! apiShell = ApiFactory.newApi(ApiShellExecutor.class, con); } catch (Exception e) { throw new Exception("Error while it tries create instance of ApiShellExecutor", e); } + if (apiShell == null) { + throw new Exception("ApiFactory has produced an ApiShell with value null.", + new Exception()); + } return apiShell; } |
|
From: Gridsystems C. <gsc...@us...> - 2008-09-03 21:27:53
|
Update of /cvsroot/fura/FuraSrc/common/systemUtils In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv8372/FuraSrc/common/systemUtils Modified Files: tag.txt Log Message: cvssync-20080903232636 Index: tag.txt =================================================================== RCS file: /cvsroot/fura/FuraSrc/common/systemUtils/tag.txt,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** tag.txt 22 Aug 2008 22:16:33 -0000 1.6 --- tag.txt 3 Sep 2008 21:27:24 -0000 1.7 *************** *** 1 **** ! V_2_9_9 \ No newline at end of file --- 1 ---- ! V_2_9_11 \ No newline at end of file |
|
From: Gridsystems C. <gsc...@us...> - 2008-09-03 21:27:52
|
Update of /cvsroot/fura/FuraSrc/Server/Plugins/ServerPlugin/brokerplugin/src/com/gridsystems/serverbroker/internal/api In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv8372/FuraSrc/Server/Plugins/ServerPlugin/brokerplugin/src/com/gridsystems/serverbroker/internal/api Modified Files: ApiServerBrokerImpl.java ServerBrokerListener.java ServerExecutorStatusWatchDog.java ServerExecutorWatchDog.java Log Message: cvssync-20080903232636 Index: ServerExecutorStatusWatchDog.java =================================================================== RCS file: /cvsroot/fura/FuraSrc/Server/Plugins/ServerPlugin/brokerplugin/src/com/gridsystems/serverbroker/internal/api/ServerExecutorStatusWatchDog.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** ServerExecutorStatusWatchDog.java 16 Jul 2008 06:55:48 -0000 1.3 --- ServerExecutorStatusWatchDog.java 3 Sep 2008 21:27:22 -0000 1.4 *************** *** 31,35 **** import com.gridsystems.resource.api.Resource; import com.gridsystems.resource.api.ResourceProperties; - import com.gridsystems.resource.api.ResourceUsage; import com.gridsystems.serverexecutor.api.ApiServerExecutor; --- 31,34 ---- *************** *** 91,96 **** try { ! AssignmentStatus[] resAssign = checkServerExecutorLock(api, r, name, ! true); // Update Assignment Status synchronized (ApiServerBrokerImpl.TOKEN_TO_UPDATE_MICROTASK) { --- 90,105 ---- try { ! ApiServerExecutor apiServer = null; ! apiServer = ServerBrokerUtils.getRemoteApiServer(name, -1); ! ! // Update Information of Server Executor in Resource List. ! AssignmentStatus[] resAssign = apiServer.status(); ! if (resAssign == null) { ! log ! .warn("The call to ApiServerExecutor::status() has returned null ?????"); ! resAssign = new AssignmentStatus[0]; ! } ! ! // checkServerExecutorLock(api, r, name, true); // Update Assignment Status synchronized (ApiServerBrokerImpl.TOKEN_TO_UPDATE_MICROTASK) { *************** *** 121,194 **** /** - * @param api Instance of ApiResourceQuery - * @param r Resource - * @param name Resource Name - * @param repeatCheck If repeatCheck - * @return List of assignment status. - * @throws Exception If error - */ - private AssignmentStatus[] checkServerExecutorLock(ApiResourceQuery api, - Resource r, String name, boolean repeatCheck) throws Exception { - - ApiServerExecutor apiServer = null; - apiServer = ServerBrokerUtils.getRemoteApiServer(name, -1); - - // Update Information of Server Executor in Resource List. - AssignmentStatus[] resAssign = apiServer.status(); - if (resAssign == null) { - log - .warn("The call to ApiServerExecutor::status() has returned null ?????"); - resAssign = new AssignmentStatus[0]; - } - - // If executor is working, OK - ResourceUsage ru = r.getUsage(); - if (resAssign.length != 0) { - return resAssign; - } - // Must have consistency between Broker and Executor. - if ((ru.getAssignments().length == 0) && (ru.isMoreAssignmentsAccepted()) - && (resAssign.length == 0)) { - return resAssign; - } - - log.warn("Inconsistency between Broker and Executor -> (ExecAssign: " - + resAssign.length + " | ResAssign=" + ru.getAssignments().length - + " | ResAcceptMore: " + ru.isMoreAssignmentsAccepted()); - - // Exists inconsistency between Broker and Executor. - if (repeatCheck) { - // Refresh values and retry test to avoid inconsistent states - // between transitional states - final long fiveSeconds = 5000; - Thread.sleep(fiveSeconds); - - r = api.getResource(r.getId()); - - resAssign = checkServerExecutorLock(api, r, name, false); - - } else { - // Inconsistency is persistent, we must unlock this state - try { - boolean acceptMore = apiServer.runAssignment(null, false); - - if (acceptMore) { - ApiResourceManager apiMan; - apiMan = ApiServerFactory.newApi(ApiResourceManager.class); - apiMan.setMoreAssignmentsAccepted(r.getId(), true); - log.warn("The ServerExecutor " + name + " was marked as " - + "No_Accept_More_Assign by ServerBroker," - + " but really the ServerExecutor is free."); - } - } catch (Exception ex) { - log.error("Cannot update resource properties of Server Executor " - + name, ex); - } - } - - return resAssign; - } - - /** * @todo Documentar * --- 130,133 ---- Index: ApiServerBrokerImpl.java =================================================================== RCS file: /cvsroot/fura/FuraSrc/Server/Plugins/ServerPlugin/brokerplugin/src/com/gridsystems/serverbroker/internal/api/ApiServerBrokerImpl.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** ApiServerBrokerImpl.java 23 Jul 2008 09:58:29 -0000 1.4 --- ApiServerBrokerImpl.java 3 Sep 2008 21:27:22 -0000 1.5 *************** *** 43,46 **** --- 43,47 ---- import com.gridsystems.module.api.ApiModuleManager; import com.gridsystems.module.api.ApiPlatformManager; + import com.gridsystems.module.api.DownloadPolicy; import com.gridsystems.module.api.Platform; import com.gridsystems.resource.ResourcePlugin; *************** *** 472,475 **** --- 473,479 ---- resProp.setOnOverloadPolicy(ResourceProperties.ON_OVERLOAD_IGNORE); + // @todo Case 11073 + resProp.setSupportedResultFilterPolicies(new String[]{DownloadPolicy.POLICY_FINAL}); + return resProp; } Index: ServerExecutorWatchDog.java =================================================================== RCS file: /cvsroot/fura/FuraSrc/Server/Plugins/ServerPlugin/brokerplugin/src/com/gridsystems/serverbroker/internal/api/ServerExecutorWatchDog.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ServerExecutorWatchDog.java 17 Jun 2008 17:18:58 -0000 1.2 --- ServerExecutorWatchDog.java 3 Sep 2008 21:27:22 -0000 1.3 *************** *** 330,334 **** computeIfAcceptMoreAssignments); computeIfAcceptMoreAssignments = false; ! ServerBrokerUtils.markServerExecutorAcceptMore(resId, acceptMoreAssignments); } catch (Exception e) { String task = amt.getTask().getId(); --- 330,337 ---- computeIfAcceptMoreAssignments); computeIfAcceptMoreAssignments = false; ! if (acceptMoreAssignments) { ! ServerBrokerUtils.markServerExecutorAcceptMore(resId, acceptMoreAssignments); ! } ! // If acceptMoreAssignments == false then it will exit of this iteration. } catch (Exception e) { String task = amt.getTask().getId(); Index: ServerBrokerListener.java =================================================================== RCS file: /cvsroot/fura/FuraSrc/Server/Plugins/ServerPlugin/brokerplugin/src/com/gridsystems/serverbroker/internal/api/ServerBrokerListener.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ServerBrokerListener.java 16 Jul 2008 06:55:48 -0000 1.2 --- ServerBrokerListener.java 3 Sep 2008 21:27:22 -0000 1.3 *************** *** 260,264 **** */ @Override ! public void afterAssignmentStart(ResourceEvent arg0) { } --- 260,285 ---- */ @Override ! public void afterAssignmentStart(ResourceEvent event) { ! ResourceId resId = event.getResource(); ! if (!ApiServerBroker.RESOURCE_TYPE.equals(resId.getResourceType())) { ! return; ! } ! // 1.- Checks ! String name = resId.getResourceName(); ! ServerExecutor se = ServerExecutorList.getInstance().get(name); ! if (se == null) { ! return; ! } ! // 2.- Mark this shell as occupied. ! try { ! if (log.isDebugEnabled()) { ! log.debug("ResourceAssignment " + event.getResourceAssignment() ! + " assigned to server resource " + resId ! + ": Setting acceptmoreAssignment to false."); ! } ! ServerBrokerUtils.markServerExecutorAcceptMore(resId, false); ! } catch (Exception e) { ! log.error("afterAssignmentStart() error", e); ! } } |
|
From: Gridsystems C. <gsc...@us...> - 2008-09-03 21:27:52
|
Update of /cvsroot/fura/FuraSrc/Server/Plugins/ResourcePlugin/plugin/src/com/gridsystems/resource/internal In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv8372/FuraSrc/Server/Plugins/ResourcePlugin/plugin/src/com/gridsystems/resource/internal Modified Files: ApiResourceGroupImpl.java ApiResourceManagerImpl.java GroupAclListener.java GroupChecker.java GroupHolder.java GroupList.java ResourceChecker.java ResourceEventUtils.java ResourceHolder.java ResourceList.java Log Message: cvssync-20080903232636 Index: ResourceEventUtils.java =================================================================== RCS file: /cvsroot/fura/FuraSrc/Server/Plugins/ResourcePlugin/plugin/src/com/gridsystems/resource/internal/ResourceEventUtils.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ResourceEventUtils.java 13 Mar 2008 08:24:02 -0000 1.1 --- ResourceEventUtils.java 3 Sep 2008 21:27:21 -0000 1.2 *************** *** 31,35 **** * Resource Events utilities. * ! * @author Xmas (2008) * @version 1.0 */ --- 31,35 ---- * Resource Events utilities. * ! * @author Xmas * @version 1.0 */ Index: ResourceChecker.java =================================================================== RCS file: /cvsroot/fura/FuraSrc/Server/Plugins/ResourcePlugin/plugin/src/com/gridsystems/resource/internal/ResourceChecker.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** ResourceChecker.java 16 Jul 2008 06:55:46 -0000 1.3 --- ResourceChecker.java 3 Sep 2008 21:27:21 -0000 1.4 *************** *** 36,40 **** * Resource Checker. * ! * @author Xmas (2008) * @version 1.0 */ --- 36,40 ---- * Resource Checker. * ! * @author Xmas * @version 1.0 */ Index: GroupHolder.java =================================================================== RCS file: /cvsroot/fura/FuraSrc/Server/Plugins/ResourcePlugin/plugin/src/com/gridsystems/resource/internal/GroupHolder.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** GroupHolder.java 16 Jul 2008 06:55:46 -0000 1.3 --- GroupHolder.java 3 Sep 2008 21:27:21 -0000 1.4 *************** *** 55,59 **** * @author Gaston Freire * @author Xmas (migration) ! * @author M. Antònia Tupores * @version 1.0 */ --- 55,59 ---- * @author Gaston Freire * @author Xmas (migration) ! * @author Antonia Tugores * @version 1.0 */ Index: ApiResourceManagerImpl.java =================================================================== RCS file: /cvsroot/fura/FuraSrc/Server/Plugins/ResourcePlugin/plugin/src/com/gridsystems/resource/internal/ApiResourceManagerImpl.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** ApiResourceManagerImpl.java 23 Jul 2008 09:58:28 -0000 1.5 --- ApiResourceManagerImpl.java 3 Sep 2008 21:27:21 -0000 1.6 *************** *** 35,40 **** /** ! * @author M. Ant�nia Tugores ! * @author Xmas (2008) */ public final class ApiResourceManagerImpl implements ApiResourceManager { --- 35,40 ---- /** ! * @author Antonia Tugores ! * @author Xmas */ public final class ApiResourceManagerImpl implements ApiResourceManager { Index: ResourceList.java =================================================================== RCS file: /cvsroot/fura/FuraSrc/Server/Plugins/ResourcePlugin/plugin/src/com/gridsystems/resource/internal/ResourceList.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** ResourceList.java 16 Jul 2008 06:55:47 -0000 1.3 --- ResourceList.java 3 Sep 2008 21:27:21 -0000 1.4 *************** *** 50,54 **** * Management of the list of resources registered in the system and its configuration. * @author Xmas (listener) ! * @author M. Antònia Tugores (Grid Systems, 2006) * @version 1.0 */ --- 50,54 ---- * Management of the list of resources registered in the system and its configuration. * @author Xmas (listener) ! * @author Antonia Tugores * @version 1.0 */ Index: GroupAclListener.java =================================================================== RCS file: /cvsroot/fura/FuraSrc/Server/Plugins/ResourcePlugin/plugin/src/com/gridsystems/resource/internal/GroupAclListener.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** GroupAclListener.java 13 Mar 2008 08:24:01 -0000 1.1 --- GroupAclListener.java 3 Sep 2008 21:27:21 -0000 1.2 *************** *** 25,29 **** /** ! * @author M Antònia Tugores (Grid Systems) * @version 1.0 * --- 25,29 ---- /** ! * @author Antonia Tugores * @version 1.0 * Index: GroupList.java =================================================================== RCS file: /cvsroot/fura/FuraSrc/Server/Plugins/ResourcePlugin/plugin/src/com/gridsystems/resource/internal/GroupList.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** GroupList.java 16 Jul 2008 06:55:46 -0000 1.3 --- GroupList.java 3 Sep 2008 21:27:21 -0000 1.4 *************** *** 54,61 **** * * @author Sergio Juan ! * @author Gastón Freire * @author Job Torres ! * * @author Xmas (migration & isQueue) ! * @author M. Antònia Tugores (Grid Systems, 2006) * @version 1.0 */ --- 54,61 ---- * * @author Sergio Juan ! * @author Gaston Freire * @author Job Torres ! * @author Xmas (migration & isQueue) ! * @author Antonia Tugores * @version 1.0 */ Index: ResourceHolder.java =================================================================== RCS file: /cvsroot/fura/FuraSrc/Server/Plugins/ResourcePlugin/plugin/src/com/gridsystems/resource/internal/ResourceHolder.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ResourceHolder.java 16 Jul 2008 06:55:47 -0000 1.2 --- ResourceHolder.java 3 Sep 2008 21:27:21 -0000 1.3 *************** *** 42,46 **** * Stores hardware configuration and state of a resource connected to the server. * ! * @author M. Antònia Tugores (Grid Systems, 2006) * @version 1.0 */ --- 42,46 ---- * Stores hardware configuration and state of a resource connected to the server. * ! * @author Antonia Tugores * @version 1.0 */ Index: GroupChecker.java =================================================================== RCS file: /cvsroot/fura/FuraSrc/Server/Plugins/ResourcePlugin/plugin/src/com/gridsystems/resource/internal/GroupChecker.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** GroupChecker.java 23 Jul 2008 09:58:29 -0000 1.2 --- GroupChecker.java 3 Sep 2008 21:27:21 -0000 1.3 *************** *** 30,34 **** * Group Checker implementation. * ! * @author Xmas (Grid Systems, 2007) * @version 1.0 */ --- 30,34 ---- * Group Checker implementation. * ! * @author Xmas * @version 1.0 */ Index: ApiResourceGroupImpl.java =================================================================== RCS file: /cvsroot/fura/FuraSrc/Server/Plugins/ResourcePlugin/plugin/src/com/gridsystems/resource/internal/ApiResourceGroupImpl.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** ApiResourceGroupImpl.java 22 Aug 2008 22:16:12 -0000 1.4 --- ApiResourceGroupImpl.java 3 Sep 2008 21:27:21 -0000 1.5 *************** *** 42,47 **** /** ! * @author M. Antònia Tugores (Grid Systems, 2006) * */ public final class ApiResourceGroupImpl implements ApiResourceGroup { --- 42,49 ---- /** ! * ApiResourceGroup service implementation. * + * @author Antonia Tugores + * @version 1.0 */ public final class ApiResourceGroupImpl implements ApiResourceGroup { |
|
From: Gridsystems C. <gsc...@us...> - 2008-09-03 21:27:52
|
Update of /cvsroot/fura/FuraSrc/Server/Plugins/WorkflowPlugin In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv8372/FuraSrc/Server/Plugins/WorkflowPlugin Modified Files: tag.txt Log Message: cvssync-20080903232636 Index: tag.txt =================================================================== RCS file: /cvsroot/fura/FuraSrc/Server/Plugins/WorkflowPlugin/tag.txt,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** tag.txt 27 Aug 2008 19:29:00 -0000 1.9 --- tag.txt 3 Sep 2008 21:27:23 -0000 1.10 *************** *** 1 **** ! V_1_4_75 \ No newline at end of file --- 1 ---- ! V_1_4_85 \ No newline at end of file |
|
From: Gridsystems C. <gsc...@us...> - 2008-09-03 21:27:52
|
Update of /cvsroot/fura/FuraSrc/Server/Plugins/TaskSubmissionPlugin In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv8372/FuraSrc/Server/Plugins/TaskSubmissionPlugin Modified Files: tag.txt Log Message: cvssync-20080903232636 Index: tag.txt =================================================================== RCS file: /cvsroot/fura/FuraSrc/Server/Plugins/TaskSubmissionPlugin/tag.txt,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** tag.txt 27 Aug 2008 19:28:59 -0000 1.9 --- tag.txt 3 Sep 2008 21:27:22 -0000 1.10 *************** *** 1 **** ! V_1_2_75 \ No newline at end of file --- 1 ---- ! V_1_2_85 \ No newline at end of file |
|
From: Gridsystems C. <gsc...@us...> - 2008-09-03 21:27:52
|
Update of /cvsroot/fura/FuraSrc/Server/Plugins/ShellPlugin/plugin/src/com/gridsystems/shellexecutor/internal/api In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv8372/FuraSrc/Server/Plugins/ShellPlugin/plugin/src/com/gridsystems/shellexecutor/internal/api Modified Files: ApiShellExecutorImpl.java AssignmentLogger.java AssignmentProcessor.java Log Message: cvssync-20080903232636 Index: ApiShellExecutorImpl.java =================================================================== RCS file: /cvsroot/fura/FuraSrc/Server/Plugins/ShellPlugin/plugin/src/com/gridsystems/shellexecutor/internal/api/ApiShellExecutorImpl.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ApiShellExecutorImpl.java 22 Aug 2008 22:16:16 -0000 1.2 --- ApiShellExecutorImpl.java 3 Sep 2008 21:27:22 -0000 1.3 *************** *** 118,124 **** for (int i = 0; i < array.length; i++) { try { ! AssignmentStatus as = array[i].getAssignStatus(); if (as.getResourceId().equals(resourceId)) { ! assignStatus.add((AssignmentStatus)as.clone()); } } catch (CloneNotSupportedException e) { --- 118,128 ---- for (int i = 0; i < array.length; i++) { try { ! AssignmentStatus as = (AssignmentStatus)array[i].getAssignStatus().clone(); if (as.getResourceId().equals(resourceId)) { ! AssignmentStatus asClone = (AssignmentStatus)as.clone(); ! if (as.getStatus() == AssignmentStatus.STATUS_FINISHED) { ! continue; ! } ! assignStatus.add(asClone); } } catch (CloneNotSupportedException e) { Index: AssignmentLogger.java =================================================================== RCS file: /cvsroot/fura/FuraSrc/Server/Plugins/ShellPlugin/plugin/src/com/gridsystems/shellexecutor/internal/api/AssignmentLogger.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** AssignmentLogger.java 16 Jul 2008 06:55:56 -0000 1.1 --- AssignmentLogger.java 3 Sep 2008 21:27:22 -0000 1.2 *************** *** 27,31 **** import com.gridsystems.resource.api.ResourceAssignment; - import com.gridsystems.shellexecutor.internal.config.ShellExecutorConfiguration; /** --- 27,30 ---- *************** *** 58,71 **** /** - * Is enabled. - */ - public final boolean isEnabled; - - /** * @param startTime Start time. */ public AssignmentLogger(long startTime) { this.lastTime = startTime; - this.isEnabled = ShellExecutorConfiguration.isEnabledDebugMode(); } --- 57,64 ---- *************** *** 108,115 **** stb.append(ShellExecutorUtils.DATEFORMAT.format(new Date())); stb.append(" ").append(msgLog).append(SEP); - - Logger theLog = Logger.getLogger(this.getClass()); - theLog.error(SEP + msgLog + SEP); - str.append(stb.toString()); } --- 101,104 ---- Index: AssignmentProcessor.java =================================================================== RCS file: /cvsroot/fura/FuraSrc/Server/Plugins/ShellPlugin/plugin/src/com/gridsystems/shellexecutor/internal/api/AssignmentProcessor.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** AssignmentProcessor.java 16 Jul 2008 06:55:56 -0000 1.1 --- AssignmentProcessor.java 3 Sep 2008 21:27:22 -0000 1.2 *************** *** 744,747 **** --- 744,750 ---- } if (this.executionType == ShellAssignment.EXECUTION_TYPE_JAVA) { + if (index >= commandParams.length) { + index = commandParams.length - 1; + } // Exclude null values. if (commandParams[index] == null) { |
|
From: Gridsystems C. <gsc...@us...> - 2008-09-03 21:27:51
|
Update of /cvsroot/fura/FuraSrc/Portal/WebApps/TaskManagerWeb/src In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv8372/FuraSrc/Portal/WebApps/TaskManagerWeb/src Modified Files: en.dict es.dict Log Message: cvssync-20080903232636 Index: es.dict =================================================================== RCS file: /cvsroot/fura/FuraSrc/Portal/WebApps/TaskManagerWeb/src/es.dict,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** es.dict 16 Jul 2008 06:55:27 -0000 1.4 --- es.dict 3 Sep 2008 21:27:19 -0000 1.5 *************** *** 97,101 **** Label.FileToImport = Fichero a importar Label.FinalIteration = Valor final de iteración ! Label.FinishedMicroTasks = µ-tareas finalizadas Label.FinishedTasks = tareas finalizadas Label.From = Desde --- 97,101 ---- Label.FileToImport = Fichero a importar Label.FinalIteration = Valor final de iteración ! Label.FinishedMicroTasks = Últimas µ-tareas finalizadas por recurso Label.FinishedTasks = tareas finalizadas Label.From = Desde Index: en.dict =================================================================== RCS file: /cvsroot/fura/FuraSrc/Portal/WebApps/TaskManagerWeb/src/en.dict,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** en.dict 16 Jul 2008 06:55:27 -0000 1.4 --- en.dict 3 Sep 2008 21:27:19 -0000 1.5 *************** *** 97,101 **** Label.FileToImport = File to import Label.FinalIteration = Final iteration value ! Label.FinishedMicroTasks = Finished µ-tasks Label.FinishedTasks = tasks finished Label.From = From --- 97,101 ---- Label.FileToImport = File to import Label.FinalIteration = Final iteration value ! Label.FinishedMicroTasks = Last finished µ-tasks by resource Label.FinishedTasks = tasks finished Label.From = From |
|
From: Gridsystems C. <gsc...@us...> - 2008-09-03 21:27:51
|
Update of /cvsroot/fura/FuraSrc/Server/Plugins/ResourcePlugin/plugin In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv8372/FuraSrc/Server/Plugins/ResourcePlugin/plugin Modified Files: pom.xml Log Message: cvssync-20080903232636 Index: pom.xml =================================================================== RCS file: /cvsroot/fura/FuraSrc/Server/Plugins/ResourcePlugin/plugin/pom.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** pom.xml 23 Jul 2008 09:58:28 -0000 1.2 --- pom.xml 3 Sep 2008 21:27:21 -0000 1.3 *************** *** 8,11 **** --- 8,12 ---- <description>Computing Resource Manager</description> <packaging>jar</packaging> + <url>http://fura.sourceforge.net/server/plugins/resource/plugin</url> <parent> *************** *** 33,35 **** --- 34,49 ---- <pluginClass>com.gridsystems.resource.ResourcePlugin</pluginClass> </properties> + + <scm> + <!-- This is necessary because the project directory does not match the artifact id --> + <connection>scm:cvs:pserver:ano...@fu...:/cvsroot/fura/FuraSrc/Server/Plugins/ResourcePlugin</connection> + <url>http://fura.cvs.sourceforge.net/fura/FuraSrc/Server/Plugins/ResourcePlugin</url> + </scm> + + <distributionManagement> + <site> + <id>fura-site</id> + <url>scp://shell.sourceforge.net/home/groups/f/fu/fura/htdocs/server/plugins/resource/plugin</url> + </site> + </distributionManagement> </project> |
|
From: Gridsystems C. <gsc...@us...> - 2008-09-03 21:27:51
|
Update of /cvsroot/fura/FuraSrc/Server/Plugins/ResourcePlugin In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv8372/FuraSrc/Server/Plugins/ResourcePlugin Modified Files: pom.xml tag.txt Log Message: cvssync-20080903232636 Index: pom.xml =================================================================== RCS file: /cvsroot/fura/FuraSrc/Server/Plugins/ResourcePlugin/pom.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** pom.xml 23 Jul 2008 09:58:26 -0000 1.2 --- pom.xml 3 Sep 2008 21:27:20 -0000 1.3 *************** *** 8,11 **** --- 8,12 ---- <description>Computing Resource Manager</description> <packaging>pom</packaging> + <url>http://fura.sourceforge.net/server/plugins/resource</url> <parent> *************** *** 19,21 **** --- 20,35 ---- <module>plugin</module> </modules> + + <scm> + <!-- This is necessary because the project directory does not match the artifact id --> + <connection>scm:cvs:pserver:ano...@fu...:/cvsroot/fura/FuraSrc/Server/Plugins/ResourcePlugin</connection> + <url>http://fura.cvs.sourceforge.net/fura/FuraSrc/Server/Plugins/ResourcePlugin</url> + </scm> + + <distributionManagement> + <site> + <id>fura-site</id> + <url>scp://shell.sourceforge.net/home/groups/f/fu/fura/htdocs/server/plugins/resource</url> + </site> + </distributionManagement> </project> Index: tag.txt =================================================================== RCS file: /cvsroot/fura/FuraSrc/Server/Plugins/ResourcePlugin/tag.txt,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** tag.txt 27 Aug 2008 19:28:58 -0000 1.9 --- tag.txt 3 Sep 2008 21:27:20 -0000 1.10 *************** *** 1 **** ! V_1_1_71 \ No newline at end of file --- 1 ---- ! V_1_1_80 \ No newline at end of file |
|
From: Gridsystems C. <gsc...@us...> - 2008-09-03 21:27:51
|
Update of /cvsroot/fura/FuraSrc/Server/Plugins/MailPlugin In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv8372/FuraSrc/Server/Plugins/MailPlugin Modified Files: tag.txt Log Message: cvssync-20080903232636 Index: tag.txt =================================================================== RCS file: /cvsroot/fura/FuraSrc/Server/Plugins/MailPlugin/tag.txt,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** tag.txt 27 Aug 2008 19:28:58 -0000 1.10 --- tag.txt 3 Sep 2008 21:27:20 -0000 1.11 *************** *** 1 **** ! V_1_3_70 \ No newline at end of file --- 1 ---- ! V_1_3_78 \ No newline at end of file |
|
From: Gridsystems C. <gsc...@us...> - 2008-09-03 21:27:50
|
Update of /cvsroot/fura/FuraSrc/Server/Plugins/ResourcePlugin/plugin/src/com/gridsystems/resource/events In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv8372/FuraSrc/Server/Plugins/ResourcePlugin/plugin/src/com/gridsystems/resource/events Modified Files: GroupEvent.java GroupListener.java ResourceEvent.java ResourceListener.java ResourceListenerAdapter.java Log Message: cvssync-20080903232636 Index: ResourceEvent.java =================================================================== RCS file: /cvsroot/fura/FuraSrc/Server/Plugins/ResourcePlugin/plugin/src/com/gridsystems/resource/events/ResourceEvent.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ResourceEvent.java 13 Mar 2008 08:24:01 -0000 1.1 --- ResourceEvent.java 3 Sep 2008 21:27:21 -0000 1.2 *************** *** 30,35 **** * Encapsulation for resource related events. * ! * @author M. Antònia Tugores (Grid Systems, 2006) ! * @author Xmas (2008) * @version 1.0 */ --- 30,35 ---- * Encapsulation for resource related events. * ! * @author Antonia Tugores ! * @author Xmas * @version 1.0 */ Index: ResourceListenerAdapter.java =================================================================== RCS file: /cvsroot/fura/FuraSrc/Server/Plugins/ResourcePlugin/plugin/src/com/gridsystems/resource/events/ResourceListenerAdapter.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ResourceListenerAdapter.java 13 Mar 2008 08:24:01 -0000 1.1 --- ResourceListenerAdapter.java 3 Sep 2008 21:27:21 -0000 1.2 *************** *** 24,28 **** * Dummy implementation class for ResourceListener. All its methods are empty. * ! * @author M. Antònia Tugores (Grid Systems, 2006) * @author Xmas * --- 24,28 ---- * Dummy implementation class for ResourceListener. All its methods are empty. * ! * @author Antonia Tugores * @author Xmas * Index: GroupListener.java =================================================================== RCS file: /cvsroot/fura/FuraSrc/Server/Plugins/ResourcePlugin/plugin/src/com/gridsystems/resource/events/GroupListener.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** GroupListener.java 22 May 2008 14:55:23 -0000 1.2 --- GroupListener.java 3 Sep 2008 21:27:21 -0000 1.3 *************** *** 27,33 **** * receive notification of predefined events. * ! * @author rruiz * @author Xmas (migration) ! * @author M. Antònia Tugores (Grid Systems, 2006) * @version 1.0 */ --- 27,33 ---- * receive notification of predefined events. * ! * @author Rodrigo Ruiz * @author Xmas (migration) ! * @author Antonia Tugores * @version 1.0 */ Index: GroupEvent.java =================================================================== RCS file: /cvsroot/fura/FuraSrc/Server/Plugins/ResourcePlugin/plugin/src/com/gridsystems/resource/events/GroupEvent.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** GroupEvent.java 22 May 2008 14:55:23 -0000 1.2 --- GroupEvent.java 3 Sep 2008 21:27:21 -0000 1.3 *************** *** 26,31 **** * Encapsulation for Group related events. * ! * @author rr...@gr... ! * @author M. Antònia Tugores (Grid Systems, 2006) * @author Xmas * @since 3.0 --- 26,31 ---- * Encapsulation for Group related events. * ! * @author Rodrigo Ruiz ! * @author Antonia Tugores * @author Xmas * @since 3.0 Index: ResourceListener.java =================================================================== RCS file: /cvsroot/fura/FuraSrc/Server/Plugins/ResourcePlugin/plugin/src/com/gridsystems/resource/events/ResourceListener.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ResourceListener.java 13 Mar 2008 08:24:01 -0000 1.1 --- ResourceListener.java 3 Sep 2008 21:27:21 -0000 1.2 *************** *** 27,32 **** * receive notification of predefined events. * ! * @author M. Antònia Tugores (Grid Systems, 2006) ! * @author Xmas (2008) * */ --- 27,32 ---- * receive notification of predefined events. * ! * @author Antonia Tugores ! * @author Xmas * */ |
|
From: Gridsystems C. <gsc...@us...> - 2008-09-03 21:27:50
|
Update of /cvsroot/fura/FuraSrc/Server/Plugins/ShellPlugin In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv8372/FuraSrc/Server/Plugins/ShellPlugin Modified Files: tag.txt Log Message: cvssync-20080903232636 Index: tag.txt =================================================================== RCS file: /cvsroot/fura/FuraSrc/Server/Plugins/ShellPlugin/tag.txt,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** tag.txt 27 Aug 2008 19:28:59 -0000 1.6 --- tag.txt 3 Sep 2008 21:27:22 -0000 1.7 *************** *** 1 **** ! V_1_1_41 \ No newline at end of file --- 1 ---- ! V_1_1_51 \ No newline at end of file |
|
From: Gridsystems C. <gsc...@us...> - 2008-09-03 21:27:50
|
Update of /cvsroot/fura/FuraSrc/common/Wizard In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv8372/FuraSrc/common/Wizard Modified Files: tag.txt Log Message: cvssync-20080903232636 Index: tag.txt =================================================================== RCS file: /cvsroot/fura/FuraSrc/common/Wizard/tag.txt,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** tag.txt 27 Aug 2008 19:29:00 -0000 1.9 --- tag.txt 3 Sep 2008 21:27:24 -0000 1.10 *************** *** 1 **** ! V_1_4_62 \ No newline at end of file --- 1 ---- ! V_1_4_67 \ No newline at end of file |
|
From: Gridsystems C. <gsc...@us...> - 2008-09-03 21:27:50
|
Update of /cvsroot/fura/FuraSrc/common/SpecificJNI/src In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv8372/FuraSrc/common/SpecificJNI/src Modified Files: Test.java Log Message: cvssync-20080903232636 Index: Test.java =================================================================== RCS file: /cvsroot/fura/FuraSrc/common/SpecificJNI/src/Test.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Test.java 22 Aug 2008 22:16:23 -0000 1.3 --- Test.java 3 Sep 2008 21:27:23 -0000 1.4 *************** *** 232,245 **** final int rchildrens3 = rchildrens - 2; ! // Results for AIX_powerpc platform ! final String[] resultsAIXPowerPc = new String[] { ! "0 - " + rchildrens + " - " + rchildrens2 + " - " + rchildrens3 + " - " ! + rchildrens + " - true - 0 - true", ! "0 - " + rchildrens + " - 0 - 1 - 0 - false - 0 - true", ! "0 - " + rchildrens + " - 0 - 1 - 0 - false - 0 - true", ! "0 - " + rchildrens + " - 0 - 0 - 0 - false - 0 - false" ! }; ! // Results for SunOS_i386 platform ! final String[] resultsSunosI386 = new String[] { "0 - " + rchildrens + " - " + rchildrens2 + " - " + rchildrens3 + " - " + rchildrens + " - true - 0 - true", --- 232,237 ---- final int rchildrens3 = rchildrens - 2; ! // Results for SunOS_i386 platform, AIX_powerpc, SunOS_sparc ! final String[] resultsUnix = new String[] { "0 - " + rchildrens + " - " + rchildrens2 + " - " + rchildrens3 + " - " + rchildrens + " - true - 0 - true", *************** *** 248,252 **** "0 - " + rchildrens + " - 0 - 0 - 0 - false - 0 - false" }; ! // Results for Darwin_powerpc platform final String[] resultsMacOsXPowerPc = new String[] { "0 - " + rchildrens + " - " + rchildrens2 + " - " + rchildrens3 --- 240,244 ---- "0 - " + rchildrens + " - 0 - 0 - 0 - false - 0 - false" }; ! // Results for Darwin_powerpc platform and resultsMacOsXI386 final String[] resultsMacOsXPowerPc = new String[] { "0 - " + rchildrens + " - " + rchildrens2 + " - " + rchildrens3 *************** *** 258,264 **** "0 - " + rchildrens + " - 0 - 0 - 0 - false - 0 - false" }; - final String[] resultsMacOsXI386 = resultsMacOsXPowerPc; - // Results for SunOS_sparc platform - final String[] resultsSunosSparc = resultsSunosI386; // Results for Windows_NT+x86 platform final String[] resultsWin32 = new String[] { --- 250,253 ---- *************** *** 275,287 **** hresults.put(SystemUtils.WINDOWS_X86, resultsWin32); ! hresults.put(SystemUtils.SUNOS_I386, resultsSunosI386); ! hresults.put(SystemUtils.SUNOS_SPARC, resultsSunosSparc); ! hresults.put(SystemUtils.AIX_POWERPC, resultsAIXPowerPc); hresults.put(SystemUtils.MACOSX_POWERPC, resultsMacOsXPowerPc); ! hresults.put(SystemUtils.MACOSX_I386, resultsMacOsXI386); String[] results = (String[])hresults.get(SystemUtils.getOsName()); if (results == null) { ! results = (String[])resultsWin32; } // Do tests --- 264,278 ---- hresults.put(SystemUtils.WINDOWS_X86, resultsWin32); ! hresults.put(SystemUtils.SUNOS_I386, resultsUnix); ! hresults.put(SystemUtils.SUNOS_SPARC, resultsUnix); ! hresults.put(SystemUtils.AIX_POWERPC, resultsUnix); hresults.put(SystemUtils.MACOSX_POWERPC, resultsMacOsXPowerPc); ! hresults.put(SystemUtils.MACOSX_I386, resultsMacOsXPowerPc); ! hresults.put(SystemUtils.LINUX_I686, resultsUnix); ! hresults.put(SystemUtils.LINUX_AMD64, resultsUnix); String[] results = (String[])hresults.get(SystemUtils.getOsName()); if (results == null) { ! results = (String[])resultsUnix; } // Do tests |
|
From: Gridsystems C. <gsc...@us...> - 2008-09-03 21:27:49
|
Update of /cvsroot/fura/FuraSrc/Server/Plugins/LocalProcessPlugin In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv8372/FuraSrc/Server/Plugins/LocalProcessPlugin Modified Files: tag.txt Log Message: cvssync-20080903232636 Index: tag.txt =================================================================== RCS file: /cvsroot/fura/FuraSrc/Server/Plugins/LocalProcessPlugin/tag.txt,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** tag.txt 27 Aug 2008 19:28:58 -0000 1.9 --- tag.txt 3 Sep 2008 21:27:20 -0000 1.10 *************** *** 1 **** ! V_1_3_70 \ No newline at end of file --- 1 ---- ! V_1_3_78 \ No newline at end of file |
|
From: Gridsystems C. <gsc...@us...> - 2008-09-03 21:27:49
|
Update of /cvsroot/fura/FuraSrc/Server/Plugins/BasicRangesPlugin In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv8372/FuraSrc/Server/Plugins/BasicRangesPlugin Modified Files: tag.txt Log Message: cvssync-20080903232636 Index: tag.txt =================================================================== RCS file: /cvsroot/fura/FuraSrc/Server/Plugins/BasicRangesPlugin/tag.txt,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** tag.txt 27 Aug 2008 19:28:57 -0000 1.9 --- tag.txt 3 Sep 2008 21:27:20 -0000 1.10 *************** *** 1 **** ! V_1_1_75 \ No newline at end of file --- 1 ---- ! V_1_1_85 \ No newline at end of file |
|
From: Gridsystems C. <gsc...@us...> - 2008-09-03 21:27:49
|
Update of /cvsroot/fura/FuraSrc/Portal/WebApps/WorkflowWeb In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv8372/FuraSrc/Portal/WebApps/WorkflowWeb Modified Files: tag.txt Log Message: cvssync-20080903232636 Index: tag.txt =================================================================== RCS file: /cvsroot/fura/FuraSrc/Portal/WebApps/WorkflowWeb/tag.txt,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** tag.txt 27 Aug 2008 19:28:56 -0000 1.9 --- tag.txt 3 Sep 2008 21:27:19 -0000 1.10 *************** *** 1 **** ! V_1_4_75 \ No newline at end of file --- 1 ---- ! V_1_4_85 \ No newline at end of file |
|
From: Gridsystems C. <gsc...@us...> - 2008-09-03 21:27:49
|
Update of /cvsroot/fura/FuraSrc/Server/Plugins/DataBasePlugin In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv8372/FuraSrc/Server/Plugins/DataBasePlugin Modified Files: tag.txt Log Message: cvssync-20080903232636 Index: tag.txt =================================================================== RCS file: /cvsroot/fura/FuraSrc/Server/Plugins/DataBasePlugin/tag.txt,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** tag.txt 27 Aug 2008 19:28:58 -0000 1.9 --- tag.txt 3 Sep 2008 21:27:20 -0000 1.10 *************** *** 1 **** ! V_1_1_70 \ No newline at end of file --- 1 ---- ! V_1_1_78 \ No newline at end of file |
|
From: Gridsystems C. <gsc...@us...> - 2008-09-03 21:27:49
|
Update of /cvsroot/fura/FuraSrc/Server/Plugins/ModuleManagerPlugin In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv8372/FuraSrc/Server/Plugins/ModuleManagerPlugin Modified Files: tag.txt Log Message: cvssync-20080903232636 Index: tag.txt =================================================================== RCS file: /cvsroot/fura/FuraSrc/Server/Plugins/ModuleManagerPlugin/tag.txt,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** tag.txt 27 Aug 2008 19:28:58 -0000 1.9 --- tag.txt 3 Sep 2008 21:27:20 -0000 1.10 *************** *** 1 **** ! V_1_1_71 \ No newline at end of file --- 1 ---- ! V_1_1_80 \ No newline at end of file |
|
From: Gridsystems C. <gsc...@us...> - 2008-09-03 21:27:49
|
Update of /cvsroot/fura/FuraSrc/Server/Plugins/PluginUtils In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv8372/FuraSrc/Server/Plugins/PluginUtils Modified Files: tag.txt Log Message: cvssync-20080903232636 Index: tag.txt =================================================================== RCS file: /cvsroot/fura/FuraSrc/Server/Plugins/PluginUtils/tag.txt,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** tag.txt 27 Aug 2008 19:28:58 -0000 1.9 --- tag.txt 3 Sep 2008 21:27:20 -0000 1.10 *************** *** 1 **** ! V_1_3_66 \ No newline at end of file --- 1 ---- ! V_1_3_73 \ No newline at end of file |
