You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@oodt.apache.org by ma...@apache.org on 2017/10/15 20:53:55 UTC
[3/8] oodt git commit: wip
wip
Project: http://git-wip-us.apache.org/repos/asf/oodt/repo
Commit: http://git-wip-us.apache.org/repos/asf/oodt/commit/64826fb4
Tree: http://git-wip-us.apache.org/repos/asf/oodt/tree/64826fb4
Diff: http://git-wip-us.apache.org/repos/asf/oodt/diff/64826fb4
Branch: refs/heads/master
Commit: 64826fb4a2f80d933122216caf9c2bb23ae7371d
Parents: 5794ec3
Author: Radu Manole <ma...@gmail.com>
Authored: Mon Aug 17 20:26:09 2015 +0300
Committer: Chris Mattmann <ch...@jpl.nasa.gov>
Committed: Sat Oct 14 12:49:28 2017 -0700
----------------------------------------------------------------------
.../apache/oodt/pcs/tools/PCSHealthMonitor.java | 29 ++++++++++++++++++--
1 file changed, 27 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/oodt/blob/64826fb4/pcs/core/src/main/java/org/apache/oodt/pcs/tools/PCSHealthMonitor.java
----------------------------------------------------------------------
diff --git a/pcs/core/src/main/java/org/apache/oodt/pcs/tools/PCSHealthMonitor.java b/pcs/core/src/main/java/org/apache/oodt/pcs/tools/PCSHealthMonitor.java
index dd65060..37bb6fb 100644
--- a/pcs/core/src/main/java/org/apache/oodt/pcs/tools/PCSHealthMonitor.java
+++ b/pcs/core/src/main/java/org/apache/oodt/pcs/tools/PCSHealthMonitor.java
@@ -18,6 +18,24 @@
package org.apache.oodt.pcs.tools;
//JDK imports
+<<<<<<< HEAD
+=======
+import java.io.IOException;
+import java.net.InetSocketAddress;
+import java.util.Calendar;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Date;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Vector;
+import java.util.logging.Level;
+
+//APACHE imports
+import org.apache.avro.ipc.NettyTransceiver;
+import org.apache.avro.ipc.specific.SpecificRequestor;
+import org.apache.oodt.cas.resource.system.extern.AvroRpcBatchStub;
+>>>>>>> a9dd1914d... wip
import org.apache.oodt.cas.crawl.daemon.CrawlDaemonController;
import org.apache.oodt.cas.filemgr.metadata.CoreMetKeys;
@@ -602,12 +620,19 @@ public final class PCSHealthMonitor implements CoreMetKeys,
}
private boolean getBatchStubUp(ResourceNode node) {
- XmlRpcClient client = new XmlRpcClient(node.getIpAddr());
- Vector argList = new Vector();
+ NettyTransceiver client;
+ AvroRpcBatchStub proxy;
try {
+<<<<<<< HEAD
return (Boolean) client.execute("batchstub.isAlive", argList);
} catch (Exception e) {
+=======
+ client = new NettyTransceiver(new InetSocketAddress(node.getIpAddr().getPort()));
+ proxy = (AvroRpcBatchStub) SpecificRequestor.getClient(AvroRpcBatchStub.class, client);
+ return proxy.isAlive();
+ } catch (IOException e) {
+>>>>>>> a9dd1914d... wip
return false;
}
}