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/18 15:41:34 UTC
svn commit: r1674509 - in /uima/sandbox/uima-ducc/trunk: src/main/admin/
uima-ducc-common/src/main/java/org/apache/uima/ducc/common/admin/event/
uima-ducc-common/src/main/java/org/apache/uima/ducc/common/main/
uima-ducc-rm/src/main/java/org/apache/uima...
Author: challngr
Date: Sat Apr 18 13:41:34 2015
New Revision: 1674509
URL: http://svn.apache.org/r1674509
Log:
UIMA-4109 Javadoc updates, and clean code to synchronize with the documentation correctly.
Added:
uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/admin/event/RmAdminVaryReply.java
Modified:
uima/sandbox/uima-ducc/trunk/src/main/admin/rm_qload
uima/sandbox/uima-ducc/trunk/src/main/admin/rm_qoccupancy
uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/admin/event/DuccAdminEvent.java
uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/admin/event/RmAdminQLoad.java
uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/admin/event/RmAdminQLoadReply.java
uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/admin/event/RmAdminQOccupancy.java
uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/admin/event/RmAdminQOccupancyReply.java
uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/admin/event/RmAdminReconfigure.java
uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/admin/event/RmAdminReply.java
uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/admin/event/RmAdminVaryOff.java
uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/admin/event/RmAdminVaryOn.java
uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/admin/event/RmQueriedClass.java
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-common/src/main/java/org/apache/uima/ducc/common/admin/event/RmQueriedNodepool.java
uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/admin/event/RmQueriedShare.java
uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/main/DuccRmAdmin.java
uima/sandbox/uima-ducc/trunk/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/ResourceManagerComponent.java
uima/sandbox/uima-ducc/trunk/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/scheduler/ISchedulerMain.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/src/main/admin/rm_qload
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/src/main/admin/rm_qload?rev=1674509&r1=1674508&r2=1674509&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/src/main/admin/rm_qload (original)
+++ uima/sandbox/uima-ducc/trunk/src/main/admin/rm_qload Sat Apr 18 13:41:34 2015
@@ -113,7 +113,7 @@ class DuccRmQLoad(DuccUtil):
DUCC_JVM_OPTS = DUCC_JVM_OPTS + ' -DDUCC_HOME=' + self.DUCC_HOME
DUCC_JVM_OPTS = DUCC_JVM_OPTS + ' -Dducc.head=' + self.ducc_properties.get('ducc.head')
- CMD = [self.java(), DUCC_JVM_OPTS, 'org.apache.uima.ducc.common.main.DuccRmAdmin', '--qload', '--compact']
+ CMD = [self.java(), DUCC_JVM_OPTS, 'org.apache.uima.ducc.common.main.DuccRmAdmin', '--qload']
CMD = ' '.join(CMD)
lines = ''
proc = subprocess.Popen(CMD, bufsize=0, stdout=subprocess.PIPE, shell=True)
Modified: uima/sandbox/uima-ducc/trunk/src/main/admin/rm_qoccupancy
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/src/main/admin/rm_qoccupancy?rev=1674509&r1=1674508&r2=1674509&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/src/main/admin/rm_qoccupancy (original)
+++ uima/sandbox/uima-ducc/trunk/src/main/admin/rm_qoccupancy Sat Apr 18 13:41:34 2015
@@ -62,7 +62,7 @@ class DuccRmQOccupancy(DuccUtil):
DUCC_JVM_OPTS = DUCC_JVM_OPTS + ' -DDUCC_HOME=' + self.DUCC_HOME
DUCC_JVM_OPTS = DUCC_JVM_OPTS + ' -Dducc.head=' + self.ducc_properties.get('ducc.head')
- CMD = [self.java(), DUCC_JVM_OPTS, 'org.apache.uima.ducc.common.main.DuccRmAdmin', '--qoccupancy', '--compact']
+ CMD = [self.java(), DUCC_JVM_OPTS, 'org.apache.uima.ducc.common.main.DuccRmAdmin', '--qoccupancy']
CMD = ' '.join(CMD)
lines = ''
proc = subprocess.Popen(CMD, bufsize=0, stdout=subprocess.PIPE, shell=True)
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/admin/event/DuccAdminEvent.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/DuccAdminEvent.java?rev=1674509&r1=1674508&r2=1674509&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/admin/event/DuccAdminEvent.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/admin/event/DuccAdminEvent.java Sat Apr 18 13:41:34 2015
@@ -25,7 +25,7 @@ import java.io.Serializable;
*/
public abstract class DuccAdminEvent implements Serializable
{
- private static final long serialVersionUID = 1753129558912646806L;
+ private static final long serialVersionUID = 1L;
private String user;
private byte[] auth_block;
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/admin/event/RmAdminQLoad.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/RmAdminQLoad.java?rev=1674509&r1=1674508&r2=1674509&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/admin/event/RmAdminQLoad.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/admin/event/RmAdminQLoad.java Sat Apr 18 13:41:34 2015
@@ -24,8 +24,8 @@ package org.apache.uima.ducc.common.admi
public class RmAdminQLoad
extends DuccAdminEvent
{
- private static final long serialVersionUID = -8101741014979144426L;
-
+ private static final long serialVersionUID = 1L;
+
public RmAdminQLoad(String user, byte[] auth)
{
super(user, auth);
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/admin/event/RmAdminQLoadReply.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/RmAdminQLoadReply.java?rev=1674509&r1=1674508&r2=1674509&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/admin/event/RmAdminQLoadReply.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/admin/event/RmAdminQLoadReply.java Sat Apr 18 13:41:34 2015
@@ -27,7 +27,7 @@ import java.util.List;
public class RmAdminQLoadReply
extends RmAdminReply
{
- private static final long serialVersionUID = -8101741014979144426L;
+ private static final long serialVersionUID = 1L;
private boolean ready = true; // if false, RM is not initialized
private long shareQuantum;
@@ -36,7 +36,7 @@ public class RmAdminQLoadReply
public RmAdminQLoadReply()
{
- super(null);
+ super();
}
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/admin/event/RmAdminQOccupancy.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/RmAdminQOccupancy.java?rev=1674509&r1=1674508&r2=1674509&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/admin/event/RmAdminQOccupancy.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/admin/event/RmAdminQOccupancy.java Sat Apr 18 13:41:34 2015
@@ -24,7 +24,7 @@ package org.apache.uima.ducc.common.admi
public class RmAdminQOccupancy
extends DuccAdminEvent
{
- private static final long serialVersionUID = -8101741014979144426L;
+ private static final long serialVersionUID = 1L;
public RmAdminQOccupancy(String user, byte[] auth)
{
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/admin/event/RmAdminQOccupancyReply.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/RmAdminQOccupancyReply.java?rev=1674509&r1=1674508&r2=1674509&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/admin/event/RmAdminQOccupancyReply.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/admin/event/RmAdminQOccupancyReply.java Sat Apr 18 13:41:34 2015
@@ -29,14 +29,14 @@ import java.util.List;
public class RmAdminQOccupancyReply
extends RmAdminReply
{
- private static final long serialVersionUID = -8101741014979144426L;
+ private static final long serialVersionUID = 1L;
boolean ready = true; // If not ready, RM is not initialized
List<RmQueriedMachine> machines = new ArrayList<RmQueriedMachine>();
public RmAdminQOccupancyReply()
{
- super(null);
+ super();
}
public void addMachine(RmQueriedMachine m)
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/admin/event/RmAdminReconfigure.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/RmAdminReconfigure.java?rev=1674509&r1=1674508&r2=1674509&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/admin/event/RmAdminReconfigure.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/admin/event/RmAdminReconfigure.java Sat Apr 18 13:41:34 2015
@@ -25,7 +25,7 @@ package org.apache.uima.ducc.common.admi
public class RmAdminReconfigure
extends DuccAdminEvent
{
- private static final long serialVersionUID = -8101741014979144426L;
+ private static final long serialVersionUID = 1L;
public RmAdminReconfigure(String user, byte[] auth)
{
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/admin/event/RmAdminReply.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/RmAdminReply.java?rev=1674509&r1=1674508&r2=1674509&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/admin/event/RmAdminReply.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/admin/event/RmAdminReply.java Sat Apr 18 13:41:34 2015
@@ -26,19 +26,52 @@ import java.io.Serializable;
public class RmAdminReply
implements Serializable
{
- private static final long serialVersionUID = -8101741014979144426L;
- String response;
+ private static final long serialVersionUID = 1;
+
+ private boolean ready = true; // if false, RM is not initialized
+ private boolean rc = true; // if true, the action worked, otherwise not
+ private String message = ""; // String response from RM for console messages.
- public RmAdminReply(String response)
+ public RmAdminReply()
+ {
+ }
+
+ /* RM only, other use produces incorrect results. */
+ public void notReady() { this.ready = false; }
+
+ /**
+ * @return True if RM is able to schedule and be queried, false otherwise. If the RM is not yet
+ * ready to schedule, e.g. immediately after boot or reconfigure, this method will return false.
+ */
+ public boolean isReady() { return ready; }
+
+ /*
+ * RM use only
+ */
+ public void setRc(boolean rc) { this.rc = rc; }
+
+ /**
+ * Returns success or failure status.
+ * @return true if the action worked, false otherwise.
+ */
+ public boolean getRc()
+ {
+ return rc;
+ }
+
+ /*
+ * RM use only.
+ */
+ public void setMessage(String m)
{
- this.response = response;
+ this.message = m;
}
/**
* @return a string with the RM's response message.
*/
- public String getResponse()
+ public String getMessage()
{
- return response;
+ return message;
}
}
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/admin/event/RmAdminVaryOff.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/RmAdminVaryOff.java?rev=1674509&r1=1674508&r2=1674509&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/admin/event/RmAdminVaryOff.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/admin/event/RmAdminVaryOff.java Sat Apr 18 13:41:34 2015
@@ -24,7 +24,7 @@ package org.apache.uima.ducc.common.admi
public class RmAdminVaryOff
extends DuccAdminEvent
{
- private static final long serialVersionUID = -8101741014979144426L;
+ private static final long serialVersionUID = 1L;
private String[] nodes;
/**
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/admin/event/RmAdminVaryOn.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/RmAdminVaryOn.java?rev=1674509&r1=1674508&r2=1674509&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/admin/event/RmAdminVaryOn.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/admin/event/RmAdminVaryOn.java Sat Apr 18 13:41:34 2015
@@ -24,7 +24,7 @@ package org.apache.uima.ducc.common.admi
public class RmAdminVaryOn
extends DuccAdminEvent
{
- private static final long serialVersionUID = -8101741014979144426L;
+ private static final long serialVersionUID = 1L;
String[] nodes;
/**
Added: uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/admin/event/RmAdminVaryReply.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/RmAdminVaryReply.java?rev=1674509&view=auto
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/admin/event/RmAdminVaryReply.java (added)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/admin/event/RmAdminVaryReply.java Sat Apr 18 13:41:34 2015
@@ -0,0 +1,47 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+*/
+package org.apache.uima.ducc.common.admin.event;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * This event returns the response of a vary on or vary off request.
+ */
+public class RmAdminVaryReply
+ extends RmAdminReply
+{
+ private static final long serialVersionUID = 1L;
+ private List<String> failedHosts = new ArrayList<String>();
+
+ public RmAdminVaryReply()
+ {
+ super();
+ }
+
+ // RM use only
+ public void addFailedHost(String h) { this.failedHosts.add(h); }
+
+ /**
+ * Returns the list of hosts for which the vary failed, if any.
+ * @return A list of the hosts which could not be varied on or off.
+ */
+ public List<String> getFailedHosts() { return failedHosts; }
+
+}
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/admin/event/RmQueriedClass.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/RmQueriedClass.java?rev=1674509&r1=1674508&r2=1674509&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/admin/event/RmQueriedClass.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/admin/event/RmQueriedClass.java Sat Apr 18 13:41:34 2015
@@ -29,7 +29,7 @@ import java.util.Arrays;
public class RmQueriedClass
implements Serializable
{
- private static final long serialVersionUID = -8101741014979144426L;
+ private static final long serialVersionUID = 1L;
private String name;
private String policy;
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=1674509&r1=1674508&r2=1674509&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 Sat Apr 18 13:41:34 2015
@@ -28,7 +28,7 @@ import java.util.List;
public class RmQueriedMachine
implements Serializable
{
- private static final long serialVersionUID = 1;
+ private static final long serialVersionUID = 1L;
String name;
String nodepoolId;
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/admin/event/RmQueriedNodepool.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/RmQueriedNodepool.java?rev=1674509&r1=1674508&r2=1674509&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/admin/event/RmQueriedNodepool.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/admin/event/RmQueriedNodepool.java Sat Apr 18 13:41:34 2015
@@ -33,7 +33,7 @@ import java.util.Arrays;
public class RmQueriedNodepool
implements Serializable
{
- private static final long serialVersionUID = -8101741014979144426L;
+ private static final long serialVersionUID = 1L;
private String name;
private int online;
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/admin/event/RmQueriedShare.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/RmQueriedShare.java?rev=1674509&r1=1674508&r2=1674509&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/admin/event/RmQueriedShare.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/admin/event/RmQueriedShare.java Sat Apr 18 13:41:34 2015
@@ -26,7 +26,7 @@ import java.io.Serializable;
public class RmQueriedShare
implements Serializable
{
- private static final long serialVersionUID = -8101741014979144426L;
+ private static final long serialVersionUID = -1L;
long jobId; // DuccID of job
long shareId; // DuccID of share
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/main/DuccRmAdmin.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/main/DuccRmAdmin.java?rev=1674509&r1=1674508&r2=1674509&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/main/DuccRmAdmin.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/main/DuccRmAdmin.java Sat Apr 18 13:41:34 2015
@@ -37,6 +37,7 @@ import org.apache.uima.ducc.common.admin
import org.apache.uima.ducc.common.admin.event.RmAdminReply;
import org.apache.uima.ducc.common.admin.event.RmAdminVaryOff;
import org.apache.uima.ducc.common.admin.event.RmAdminVaryOn;
+import org.apache.uima.ducc.common.admin.event.RmAdminVaryReply;
import org.apache.uima.ducc.common.authentication.BrokerCredentials;
import org.apache.uima.ducc.common.authentication.BrokerCredentials.Credentials;
import org.apache.uima.ducc.common.component.AbstractDuccComponent;
@@ -216,18 +217,19 @@ public class DuccRmAdmin
*
* @param args This is an array of hostnames indicating the hosts to be varied offline.
*
- * @return A generic {@link RmAdminReply RmAdminReply} indicating the result of the action.
+ * @return A {@link RmAdminVaryReply RmAdminVaryReply} with success or failure status and if failure, the list of
+ * hosts that could not be varied off.
*
* @throws Exception if anything goes wrong in transmission or receipt of the request.
*/
- public RmAdminReply varyoff(String[] args)
+ public RmAdminVaryReply varyoff(String[] args)
throws Exception
{
String[] nodes = new String[args.length - 1];
for ( int i = 1; i < args.length; i++) nodes[i-1] = args[i]; // take a slice of the array
RmAdminVaryOff vo = new RmAdminVaryOff(nodes, user, cypheredMessage);
- return dispatchAndWaitForReply(vo);
+ return (RmAdminVaryReply) dispatchAndWaitForReply(vo);
}
/**
@@ -238,18 +240,19 @@ public class DuccRmAdmin
*
* @param args This is an array of hostnames indicating the hosts to be varied nline.
*
- * @return A generic {@link RmAdminReply RmAdminReply} indicating the result of the action.
+ * @return A {@link RmAdminVaryReply RmAdminVaryReply} with success or failure status and if failure, the list of
+ * hosts that could not be varied on.
*
* @throws Exception if anything goes wrong in transmission or receipt of the request.
*/
- public RmAdminReply varyon(String[] args)
+ public RmAdminVaryReply varyon(String[] args)
throws Exception
{
String[] nodes = new String[args.length - 1];
for ( int i = 1; i < args.length; i++) nodes[i-1] = args[i]; // take a slice of the array
RmAdminVaryOn vo = new RmAdminVaryOn(nodes, user, cypheredMessage);
- return dispatchAndWaitForReply(vo);
+ return (RmAdminVaryReply) dispatchAndWaitForReply(vo);
}
/**
@@ -317,25 +320,27 @@ public class DuccRmAdmin
if ( args[0].equals("--varyoff")) {
if ( args.length < 2 ) usage("Missing node list");
- RmAdminReply reply = varyoff(args);
- System.out.println(reply.getResponse());
+ RmAdminVaryReply reply = varyoff(args);
+ System.out.println(reply.getMessage());
return;
}
if ( args[0].equals("--varyon")) {
if ( args.length < 2 ) usage("Missing node list");
- RmAdminReply reply = varyon(args);
- System.out.println(reply.getResponse());
+ RmAdminVaryReply reply = varyon(args);
+ System.out.println(reply.getMessage());
return;
}
if ( args[0].equals("--qload")) {
+ if ( args.length != 1 ) usage("Qload takes no arguments.");
RmAdminQLoadReply ret = qload();
System.out.println(ret.toString());
return;
}
if ( args[0].equals("--qoccupancy")) {
+ if ( args.length != 1 ) usage("Qoccupancy takes no arguments.");
RmAdminQOccupancyReply ret = qoccupancy();
System.out.println(ret.toString());
return;
@@ -344,7 +349,7 @@ public class DuccRmAdmin
if ( args[0].equals("--reconfigure") ) { // UIMA-4142
if ( args.length != 1 ) usage("Reconfigure takes no arguments.");
RmAdminReply reply = reconfigure();
- System.out.println(reply.getResponse());
+ System.out.println(reply.getMessage());
return;
}
@@ -372,13 +377,15 @@ public class DuccRmAdmin
*/
public static void main(String[] args)
{
+ int rc = 0;
try {
DuccRmAdmin admin = new DuccRmAdmin(new DefaultCamelContext(), "ducc.rm.admin.endpoint");
admin.run(args);
} catch (Throwable e) {
e.printStackTrace();
+ rc = 1;
} finally {
- System.exit(-1);
+ System.exit(rc);
}
}
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/ResourceManagerComponent.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/ResourceManagerComponent.java?rev=1674509&r1=1674508&r2=1674509&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/ResourceManagerComponent.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/ResourceManagerComponent.java Sat Apr 18 13:41:34 2015
@@ -32,6 +32,7 @@ import org.apache.uima.ducc.common.admin
import org.apache.uima.ducc.common.admin.event.RmAdminReply;
import org.apache.uima.ducc.common.admin.event.RmAdminVaryOff;
import org.apache.uima.ducc.common.admin.event.RmAdminVaryOn;
+import org.apache.uima.ducc.common.admin.event.RmAdminVaryReply;
import org.apache.uima.ducc.common.boot.DuccDaemonRuntimeProperties;
import org.apache.uima.ducc.common.boot.DuccDaemonRuntimeProperties.DaemonName;
import org.apache.uima.ducc.common.component.AbstractDuccComponent;
@@ -147,25 +148,31 @@ public class ResourceManagerComponent
DuccAdminEvent dae = (DuccAdminEvent) body;
if (body instanceof RmAdminVaryOff) {
if ( ! validateAdministrator(dae) ) {
- reply = new RmAdminReply("Not authorized");
+ reply = new RmAdminVaryReply();
+ reply.setRc(false);
+ reply.setMessage("Not authorized");
} else {
RmAdminVaryOff vo = (RmAdminVaryOff) body;
- reply = new RmAdminReply(scheduler.varyoff(vo.getNodes()));
+ reply = scheduler.varyoff(vo.getNodes());
}
} else
if (body instanceof RmAdminVaryOn) {
if ( ! validateAdministrator(dae) ) {
- reply = new RmAdminReply("Not authorized");
+ reply = new RmAdminVaryReply();
+ reply.setRc(false);
+ reply.setMessage("Not authorized");
} else {
RmAdminVaryOn vo = (RmAdminVaryOn) body;
- reply = new RmAdminReply(scheduler.varyon(vo.getNodes()));
+ reply = scheduler.varyon(vo.getNodes());
}
} else
if (body instanceof RmAdminReconfigure) { // UIMA-4142
if ( ! validateAdministrator(dae) ) {
- reply = new RmAdminReply("Not authorized");
+ reply = new RmAdminReply();
+ reply.setRc(false);
+ reply.setMessage("Not authorized");
} else {
- reply = new RmAdminReply(scheduler.reconfigure());
+ reply = scheduler.reconfigure();
}
} else
if (body instanceof RmAdminQLoad) {
@@ -177,11 +184,13 @@ public class ResourceManagerComponent
reply = scheduler.queryOccupancy();
} else {
logger.info(methodName, null, "Invalid admin command:", body.getClass().getName());
- reply = new RmAdminReply("Unrecognized RM admin request.");
+ reply = new RmAdminReply();
+ reply.setMessage("Unrecognized RM admin request.");
}
} else {
logger.info(methodName, null, "Invalid RM event:", body.getClass().getName());
- reply = new RmAdminReply("Unrecognized RM event.");
+ reply = new RmAdminReply();
+ reply.setMessage("Unrecognized RM event.");
}
exchange.getIn().setBody(reply);
}
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/scheduler/ISchedulerMain.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/scheduler/ISchedulerMain.java?rev=1674509&r1=1674508&r2=1674509&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/scheduler/ISchedulerMain.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/scheduler/ISchedulerMain.java Sat Apr 18 13:41:34 2015
@@ -24,6 +24,7 @@ import org.apache.uima.ducc.common.Node;
import org.apache.uima.ducc.common.NodeIdentity;
import org.apache.uima.ducc.common.admin.event.RmAdminQLoadReply;
import org.apache.uima.ducc.common.admin.event.RmAdminQOccupancyReply;
+import org.apache.uima.ducc.common.admin.event.RmAdminReply;
import org.apache.uima.ducc.common.utils.id.DuccId;
@@ -76,9 +77,9 @@ public interface ISchedulerMain
// once both initialized() and ready() occur, the RM scaffolding will enable scheduling by calling start
void start();
- String varyoff(String[] nodes);
- String varyon(String[] nodes);
- String reconfigure();
+ RmAdminReply varyoff(String[] nodes);
+ RmAdminReply varyon(String[] nodes);
+ RmAdminReply reconfigure();
RmAdminQLoadReply queryLoad();
RmAdminQOccupancyReply queryOccupancy();
}
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=1674509&r1=1674508&r2=1674509&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 Sat Apr 18 13:41:34 2015
@@ -32,6 +32,8 @@ import org.apache.uima.ducc.common.NodeI
import org.apache.uima.ducc.common.Pair;
import org.apache.uima.ducc.common.admin.event.RmAdminQLoadReply;
import org.apache.uima.ducc.common.admin.event.RmAdminQOccupancyReply;
+import org.apache.uima.ducc.common.admin.event.RmAdminReply;
+import org.apache.uima.ducc.common.admin.event.RmAdminVaryReply;
import org.apache.uima.ducc.common.admin.event.RmQueriedClass;
import org.apache.uima.ducc.common.admin.event.RmQueriedMachine;
import org.apache.uima.ducc.common.admin.event.RmQueriedNodepool;
@@ -263,10 +265,11 @@ public class Scheduler
initialized = true;
}
- public String reconfigure() // UIMA-4142
+ public RmAdminReply reconfigure() // UIMA-4142
{
String methodName = "reconfigure";
+ RmAdminReply ret = new RmAdminReply();
logger.info(methodName, null, "Reconfiguration starts.");
setInitialized(false); // stop receipt of OR and Agent publications
@@ -278,7 +281,9 @@ public class Scheduler
} catch (Throwable e) {
setInitialized(true);
logger.warn(methodName, null, "Reconfiguration aborted:", e.toString());
- return "Reconfiguration failed: " + e.toString();
+ ret.setRc(false);
+ ret.setMessage("Reconfiguration failed: " + e.toString());
+ return ret;
}
HashMap<Node, Machine> offlineMachines = new HashMap<Node, Machine>();
@@ -327,7 +332,8 @@ public class Scheduler
setInitialized(true); // resume receipt of publications
logger.info(methodName, null, "Reconfiguration complete.");
- return "Reconfiguration complete.";
+ ret.setMessage("Reconfiguration complete.");
+ return ret;
}
public synchronized void setRecovery(boolean v)
@@ -1147,44 +1153,63 @@ public class Scheduler
}
}
- public synchronized String varyon(String[] nodes)
+ public synchronized RmAdminReply varyon(String[] nodes)
{
String methodName = "varyon";
- StringBuffer reply = new StringBuffer();
+ RmAdminVaryReply ret = new RmAdminVaryReply();
+ StringBuffer sb = new StringBuffer();
for (String n : nodes ) {
- n = resolve(n);
- if ( n == null ) {
- reply.append("VaryOn: " + n + " cannot be found in the RM.\n");
+ String rn = resolve(n);
+ if ( rn == null ) {
+ ret.setRc(false);
+ ret.addFailedHost(n);
+ sb.append("VaryOn: " + n + " cannot be found in the RM.\n");
} else {
- NodePool np = nodepoolsByNode.get(n); // if null, resolve will fail
- String repl = np.varyon(n);
- logger.info(methodName, null, repl);
- reply.append(repl);
- reply.append("\n");
+ NodePool np = nodepoolsByNode.get(rn); // if null, resolve will fail
+ if ( np == null ) {
+ ret.setRc(false);
+ ret.addFailedHost(rn);
+ sb.append("VaryOn: " + n + " cannot find associated nodepool.\n");
+ } else {
+ String repl = np.varyon(rn);
+ logger.info(methodName, null, repl);
+ sb.append(repl);
+ sb.append("\n");
+ }
}
}
- return reply.toString();
+ ret.setMessage(sb.toString());
+ return ret;
}
- public synchronized String varyoff(String[] nodes)
+ public synchronized RmAdminReply varyoff(String[] nodes)
{
String methodName = "varyoff";
- StringBuffer reply = new StringBuffer();
+ RmAdminVaryReply ret = new RmAdminVaryReply();
+ StringBuffer sb = new StringBuffer();
for (String n : nodes ) {
- n = resolve(n);
- if ( n == null ) {
- reply.append("VaryOff: " + n + " cannot be found in the RM.\n");
+ String rn = resolve(n);
+ if ( rn == null ) {
+ ret.setRc(false);
+ ret.addFailedHost(n);
+ sb.append("VaryOff: " + n + " cannot be found in the RM.\n");
} else {
- NodePool np = nodepoolsByNode.get(n); // if null, resolve will fail
- String repl = np.varyoff(n);
- logger.info(methodName, null, repl);
- reply.append(repl);
- reply.append("\n");
+ NodePool np = nodepoolsByNode.get(rn); // if null, resolve will fail
+ if ( np == null ) {
+ ret.setRc(false);
+ ret.addFailedHost(rn);
+ } else {
+ String repl = np.varyoff(rn);
+ logger.info(methodName, null, repl);
+ sb.append(repl);
+ sb.append("\n");
+ }
}
}
- return reply.toString();
+ ret.setMessage(sb.toString());
+ return ret;
}
RmQueriedNodepool getNpStats(NodePool np)