You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by de...@apache.org on 2016/06/30 19:53:48 UTC
svn commit: r1750858 - in /uima/uima-ducc/trunk: src/main/admin/
uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/aio/
uima-ducc-database/src/main/java/org/apache/uima/ducc/database/
uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/...
Author: degenaro
Date: Thu Jun 30 19:53:48 2016
New Revision: 1750858
URL: http://svn.apache.org/viewvc?rev=1750858&view=rev
Log:
UIMA-4989 Fix problems found by FindBugs
Modified:
uima/uima-ducc/trunk/src/main/admin/ducc_util.py
uima/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/aio/AllInOne.java
uima/uima-ducc/trunk/uima-ducc-database/src/main/java/org/apache/uima/ducc/database/DbAlive.java
uima/uima-ducc/trunk/uima-ducc-database/src/main/java/org/apache/uima/ducc/database/HistoryManagerDb.java
uima/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/configuration/jp/DuccHttpClient.java
uima/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/configuration/jp/JobProcessConfiguration.java
Modified: uima/uima-ducc/trunk/src/main/admin/ducc_util.py
URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/src/main/admin/ducc_util.py?rev=1750858&r1=1750857&r2=1750858&view=diff
==============================================================================
--- uima/uima-ducc/trunk/src/main/admin/ducc_util.py (original)
+++ uima/uima-ducc/trunk/src/main/admin/ducc_util.py Thu Jun 30 19:53:48 2016
@@ -355,6 +355,10 @@ class DuccUtil(DuccBase):
def ssh(self, host, do_wait, *CMD):
cmd = ' '.join(CMD)
+ if ( host == self.localhost ):
+ if (cmd[0] == "" and cmd[-1] == ""):
+ cmd = cmd[1:len(cmd)-2]
+ return self.popen(cmd)
if ( do_wait ):
return self.popen('ssh -q -o BatchMode=yes -o ConnectTimeout=10', host, cmd)
else:
Modified: uima/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/aio/AllInOne.java
URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/aio/AllInOne.java?rev=1750858&r1=1750857&r2=1750858&view=diff
==============================================================================
--- uima/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/aio/AllInOne.java (original)
+++ uima/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/aio/AllInOne.java Thu Jun 30 19:53:48 2016
@@ -21,7 +21,6 @@ package org.apache.uima.ducc.cli.aio;
import java.util.Properties;
import org.apache.uima.cas.CAS;
-import org.apache.uima.cas.impl.XmiSerializationSharedData;
import org.apache.uima.ducc.user.common.DuccUimaSerializer;
public class AllInOne {
Modified: uima/uima-ducc/trunk/uima-ducc-database/src/main/java/org/apache/uima/ducc/database/DbAlive.java
URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-database/src/main/java/org/apache/uima/ducc/database/DbAlive.java?rev=1750858&r1=1750857&r2=1750858&view=diff
==============================================================================
--- uima/uima-ducc/trunk/uima-ducc-database/src/main/java/org/apache/uima/ducc/database/DbAlive.java (original)
+++ uima/uima-ducc/trunk/uima-ducc-database/src/main/java/org/apache/uima/ducc/database/DbAlive.java Thu Jun 30 19:53:48 2016
@@ -26,7 +26,6 @@ import com.datastax.driver.core.Host;
import com.datastax.driver.core.KeyspaceMetadata;
import com.datastax.driver.core.Metadata;
import com.datastax.driver.core.PlainTextAuthProvider;
-import com.datastax.driver.core.Session;
import com.datastax.driver.core.TableMetadata;
import com.datastax.driver.core.exceptions.AuthenticationException;
import com.datastax.driver.core.exceptions.NoHostAvailableException;
@@ -64,7 +63,7 @@ public class DbAlive
};
private Cluster cluster;
- private Session session;
+ //private Session session;
public DbAlive(String dburl, String adminid, String adminpw)
{
@@ -122,11 +121,6 @@ public class DbAlive
public void close() {
cluster.close();
}
-
- public Session getSession()
- {
- return this.session;
- }
static void usage()
{
Modified: uima/uima-ducc/trunk/uima-ducc-database/src/main/java/org/apache/uima/ducc/database/HistoryManagerDb.java
URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-database/src/main/java/org/apache/uima/ducc/database/HistoryManagerDb.java?rev=1750858&r1=1750857&r2=1750858&view=diff
==============================================================================
--- uima/uima-ducc/trunk/uima-ducc-database/src/main/java/org/apache/uima/ducc/database/HistoryManagerDb.java (original)
+++ uima/uima-ducc/trunk/uima-ducc-database/src/main/java/org/apache/uima/ducc/database/HistoryManagerDb.java Thu Jun 30 19:53:48 2016
@@ -766,6 +766,9 @@ public class HistoryManagerDb
ResultSet rs = h.execute(cql);
for ( Row r : rs ) {
logger.info(methodName, null, "Found checkpoint.");
+ if(r == null) {
+ continue;
+ }
ByteBuffer bbWork = r.getBytes("work");
ByteBuffer bbmap = r.getBytes("p2jmap");
Modified: uima/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/configuration/jp/DuccHttpClient.java
URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/configuration/jp/DuccHttpClient.java?rev=1750858&r1=1750857&r2=1750858&view=diff
==============================================================================
--- uima/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/configuration/jp/DuccHttpClient.java (original)
+++ uima/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/configuration/jp/DuccHttpClient.java Thu Jun 30 19:53:48 2016
@@ -232,7 +232,6 @@ public class DuccHttpClient {
}
public IMetaCasTransaction execute( IMetaCasTransaction transaction, HttpPost postMethod ) throws Exception {
- int retry = 2;
Exception lastError = null;
IMetaCasTransaction reply=null;
Modified: uima/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/configuration/jp/JobProcessConfiguration.java
URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/configuration/jp/JobProcessConfiguration.java?rev=1750858&r1=1750857&r2=1750858&view=diff
==============================================================================
--- uima/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/configuration/jp/JobProcessConfiguration.java (original)
+++ uima/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/configuration/jp/JobProcessConfiguration.java Thu Jun 30 19:53:48 2016
@@ -18,18 +18,13 @@
*/
package org.apache.uima.ducc.transport.configuration.jp;
-import java.net.InetAddress;
-
import org.apache.camel.CamelContext;
-import org.apache.camel.Exchange;
-import org.apache.camel.Predicate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.uima.ducc.common.IDuccUser;
import org.apache.uima.ducc.common.config.CommonConfiguration;
import org.apache.uima.ducc.common.container.FlagsHelper;
import org.apache.uima.ducc.common.utils.Utils;
import org.apache.uima.ducc.container.jp.JobProcessManager;
-import org.apache.uima.ducc.transport.DuccExchange;
import org.apache.uima.ducc.transport.DuccTransportConfiguration;
import org.apache.uima.ducc.transport.agent.ProcessStateUpdate;
import org.apache.uima.ducc.transport.dispatcher.DuccEventDispatcher;
@@ -164,13 +159,6 @@ public class JobProcessConfiguration {
throw e;
}
try {
-
- // Assume IP address provided from environment. In production this
- // will be the actual node IP. In testing, the IP can be virtual
- // when running multiple agents on the same node. The agent is
- // responsible for providing the IP in this process environment.
- String thisNodeIP = (System.getenv(IDuccUser.EnvironmentVariable.DUCC_IP.value()) == null) ? InetAddress
- .getLocalHost().getHostAddress() : System.getenv(IDuccUser.EnvironmentVariable.DUCC_IP.value());
camelContext = common.camelContext();
// currently supported jobType values:
@@ -282,34 +270,4 @@ public class JobProcessConfiguration {
}
}
- private class DuccProcessFilter implements Predicate {
- String thisNodeIP;
-
- public DuccProcessFilter(final String thisNodeIP) {
- this.thisNodeIP = thisNodeIP;
- }
-
- public synchronized boolean matches(Exchange exchange) {
- // String methodName="DuccProcessFilter.matches";
- boolean result = false;
- try {
- String pid = (String) exchange.getIn().getHeader(
- DuccExchange.ProcessPID);
- String targetIP = (String) exchange.getIn().getHeader(
- DuccExchange.DUCCNODEIP);
- // check if this message is targeting this process. Check if the
- // process PID
- // and the node match target process.
- if (Utils.getPID().equals(pid) && thisNodeIP.equals(targetIP)) {
- result = true;
- System.out
- .println(">>>>>>>>> Process Received a Message. Is Process target for message:"
- + result + ". Target PID:" + pid);
- }
- } catch (Throwable e) {
- e.printStackTrace();
- }
- return result;
- }
- }
}