You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by ch...@apache.org on 2015/04/17 22:04:57 UTC
svn commit: r1674392 - in /uima/sandbox/uima-ducc/trunk: pom.xml
uima-ducc-common/src/main/java/org/apache/uima/ducc/common/admin/event/RmQueriedMachine.java
uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/scheduler/Scheduler.java
Author: challngr
Date: Fri Apr 17 20:04:57 2015
New Revision: 1674392
URL: http://svn.apache.org/r1674392
Log:
UIMA-4109 Javadoc cleanup.
Modified:
uima/sandbox/uima-ducc/trunk/pom.xml
uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/admin/event/RmQueriedMachine.java
uima/sandbox/uima-ducc/trunk/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/scheduler/Scheduler.java
Modified: uima/sandbox/uima-ducc/trunk/pom.xml
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/pom.xml?rev=1674392&r1=1674391&r2=1674392&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/pom.xml (original)
+++ uima/sandbox/uima-ducc/trunk/pom.xml Fri Apr 17 20:04:57 2015
@@ -239,8 +239,20 @@
user code -->
<additionalparam>
${basedir}/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/IServiceStatistics.java
- ${basedir}/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/utils/id/ADuccId.java
- ${basedir}/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/utils/id/IDuccId.java
+ ${basedir}/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/main/DuccRmAdmin.java
+ ${basedir}/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/admin/event/DuccAdminEvent.java
+ ${basedir}/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/admin/event/RmAdminQLoad.java
+ ${basedir}/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/admin/event/RmAdminQLoadReply.java
+ ${basedir}/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/admin/event/RmAdminQOccupancy.java
+ ${basedir}/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/admin/event/RmAdminQOccupancyReply.java
+ ${basedir}/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/admin/event/RmAdminReconfigure.java
+ ${basedir}/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/admin/event/RmAdminReply.java
+ ${basedir}/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/admin/event/RmAdminVaryOff.java
+ ${basedir}/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/admin/event/RmAdminVaryOn.java
+ ${basedir}/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/admin/event/RmQueriedClass.java
+ ${basedir}/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/admin/event/RmQueriedMachine.java
+ ${basedir}/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/admin/event/RmQueriedNodepool.java
+ ${basedir}/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/admin/event/RmQueriedShare.java
${basedir}/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/sm/IServiceReply.java
${basedir}/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/sm/IServiceDescription.java
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/admin/event/RmQueriedMachine.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/admin/event/RmQueriedMachine.java?rev=1674392&r1=1674391&r2=1674392&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/admin/event/RmQueriedMachine.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/admin/event/RmQueriedMachine.java Fri Apr 17 20:04:57 2015
@@ -62,22 +62,37 @@ public class RmQueriedMachine
}
/**
+ * Return the list of shares scheduled to this host.
+ * @return The list of {@link RmQueriedShare shares}.
+ */
+ public List<RmQueriedShare> getShares()
+ {
+ return shares;
+ }
+
+ /**
+ * Returns the name of the machin.
* @return the name of the machine.
*/
public String getId() { return name; }
/**
+ * Returns the amount of RAM in KB (kilobytes) on the machine.
* @return the amount of RAM in the machine, in kilobytes.
*/
public long getMemory() { return memory; }
/**
+ * Returns the share order of the machine.
+ *
* @return the number of quantum shares supported by the machine. For example, if the share quantum is
* 15GB, a 48GB machine is of order 3.
*/
public int getShareOrder() { return order; }
/**
+ * Returns whether the machine is blacklisted.
+ *
* @return whether the host contains blacklisted processes. A blacklisted process is one whose characteristics
* no longer match the machine. For example, after reconfiguration, this may be an illegal assignemnt
* for the request. Until such time as the request is (externally) removed, the RM has to account for
@@ -87,12 +102,15 @@ public class RmQueriedMachine
public boolean isBlacklisted() { return blacklisted; } // UIMA-4142
/**
+ * Returns whether the machine is varied online.
+ *
* @return true if the machine is varied online and false otherwise. Note that a machine might "not varied offline",
* but not responsive (not sending heartbeats).
*/
public boolean isOnline() { return online; } // UIMA-4142
/**
+ * Indicates whether the machine is sending heartbeats.
* @return true if the machine is sending heartbeats. Note that a machine might be sending heartbeats but be varied
* offline or blacklisted, and hence not schedulable.
*/
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/scheduler/Scheduler.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/scheduler/Scheduler.java?rev=1674392&r1=1674391&r2=1674392&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/scheduler/Scheduler.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/scheduler/Scheduler.java Fri Apr 17 20:04:57 2015
@@ -1207,6 +1207,8 @@ public class Scheduler
for ( int i = 1; i < freeMachines.length; i++ ) {
freeMachines[i] += np.countFreeMachines(i); // (these are local, as we want)
}
+
+ np.getLocalOnlineByOrder(onlineMachines);
ret.setOnlineMachines(onlineMachines);
ret.setFreeMachines(freeMachines);