Michael Blow has uploaded a new change for review. https://asterix-gerrit.ics.uci.edu/3312
Change subject: PLEASE EDIT to provide a meaningful commit message! ...................................................................... PLEASE EDIT to provide a meaningful commit message! The following commits from your working branch will be included: commit 4ce0cbbfde42525bf005bfbef7aa5ba5d0a9707c Author: Michael Blow <[email protected]> Date: Tue Apr 2 21:31:43 2019 -0400 foo commit fe8f855711a9fe97056b62149151b7739de21a46 Author: Michael Blow <[email protected]> Date: Tue Apr 2 21:27:06 2019 -0400 foo commit 235b75839da74b32df56075a45c72ae56138b79c Author: Michael Blow <[email protected]> Date: Tue Apr 2 21:19:15 2019 -0400 foo commit 28dc2f3ed10a3fbc4b8cb8d2596b621dea465779 Author: Michael Blow <[email protected]> Date: Tue Apr 2 20:46:50 2019 -0400 foo commit 9b1706a4247f1279f3e19d8c405949cdbb108b0d Author: Michael Blow <[email protected]> Date: Tue Apr 2 20:39:02 2019 -0400 foo commit 6324221b21116f8cad61b67559cfd42712a71921 Author: Michael Blow <[email protected]> Date: Tue Apr 2 20:37:47 2019 -0400 foo commit 0ece97ef487ffe21c560296d59e570a2831577aa Author: Michael Blow <[email protected]> Date: Tue Apr 2 20:19:25 2019 -0400 foo Change-Id: Ic2371171dfc01423921c2e2d04fbc68a38978f2e --- M hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/NodeControllerData.java M hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/controllers/NodeRegistration.java R hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/resources/log4j2.xml M hyracks-fullstack/hyracks/hyracks-util/src/main/java/org/apache/hyracks/util/PidHelper.java M hyracks-fullstack/hyracks/hyracks-util/src/main/java/org/apache/hyracks/util/trace/Event.java M hyracks-fullstack/hyracks/hyracks-util/src/main/java/org/apache/hyracks/util/trace/Tracer.java 6 files changed, 20 insertions(+), 10 deletions(-) git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb refs/changes/12/3312/1 diff --git a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/NodeControllerData.java b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/NodeControllerData.java index c37acab..24a3e57 100644 --- a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/NodeControllerData.java +++ b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/NodeControllerData.java @@ -79,7 +79,7 @@ private final Map<String, String> systemProperties; - private final int pid; + private final long pid; private final HeartbeatSchema hbSchema; diff --git a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/controllers/NodeRegistration.java b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/controllers/NodeRegistration.java index 437b001..474bc0a 100644 --- a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/controllers/NodeRegistration.java +++ b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/controllers/NodeRegistration.java @@ -75,7 +75,7 @@ private final NetworkAddress messagingPort; - private final int pid; + private final long pid; private final NodeCapacity capacity; @@ -190,7 +190,7 @@ return messagingPort; } - public int getPid() { + public long getPid() { return pid; } } diff --git a/asterixdb/asterix-app/src/main/resources/log4j2.xml b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/resources/log4j2.xml similarity index 100% rename from asterixdb/asterix-app/src/main/resources/log4j2.xml rename to hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/resources/log4j2.xml diff --git a/hyracks-fullstack/hyracks/hyracks-util/src/main/java/org/apache/hyracks/util/PidHelper.java b/hyracks-fullstack/hyracks/hyracks-util/src/main/java/org/apache/hyracks/util/PidHelper.java index 5a8edbd..46e77e3 100644 --- a/hyracks-fullstack/hyracks/hyracks-util/src/main/java/org/apache/hyracks/util/PidHelper.java +++ b/hyracks-fullstack/hyracks/hyracks-util/src/main/java/org/apache/hyracks/util/PidHelper.java @@ -21,6 +21,7 @@ import java.lang.management.ManagementFactory; import java.lang.management.RuntimeMXBean; import java.lang.reflect.Field; +import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import org.apache.logging.log4j.Level; @@ -34,11 +35,20 @@ private PidHelper() { } - public static int getPid() { + public static long getPid() { return getPid(ManagementFactory.getRuntimeMXBean()); } - public static int getPid(RuntimeMXBean runtimeMXBean) { + public static long getPid(RuntimeMXBean runtimeMXBean) { + // TODO: replace with direct invoke of getPid() once compatibility is at JDK 10 or higher + try { + Method getPidMethod = runtimeMXBean.getClass().getMethod("getPid"); + return (Long) getPidMethod.invoke(runtimeMXBean); + } catch (NoSuchMethodException e) { + LOGGER.debug("ignoring exception trying to find getPid() (expected pre-JDK 10)", e); + } catch (IllegalAccessException | InvocationTargetException e) { + LOGGER.debug("ignoring exception trying to execute getPid()", e); + } try { Field jvmField = runtimeMXBean.getClass().getDeclaredField("jvm"); jvmField.setAccessible(true); diff --git a/hyracks-fullstack/hyracks/hyracks-util/src/main/java/org/apache/hyracks/util/trace/Event.java b/hyracks-fullstack/hyracks/hyracks-util/src/main/java/org/apache/hyracks/util/trace/Event.java index b5fe3d3..b744198 100644 --- a/hyracks-fullstack/hyracks/hyracks-util/src/main/java/org/apache/hyracks/util/trace/Event.java +++ b/hyracks-fullstack/hyracks/hyracks-util/src/main/java/org/apache/hyracks/util/trace/Event.java @@ -28,14 +28,14 @@ public final long cat; public final ITracer.Phase ph; public final long ts; - public final int pid; + public final long pid; public final long tid; public final ITracer.Scope scope; public final String args; public final TraceCategoryRegistry registry; - private Event(String name, long cat, ITracer.Phase ph, long ts, int pid, long tid, ITracer.Scope scope, String args, - TraceCategoryRegistry registry) { + private Event(String name, long cat, ITracer.Phase ph, long ts, long pid, long tid, ITracer.Scope scope, + String args, TraceCategoryRegistry registry) { this.name = name; this.cat = cat; this.ph = ph; @@ -51,7 +51,7 @@ return (System.nanoTime() - NANOTIME_DELTA_TO_EPOCH) / 1000; } - public static Event create(String name, long cat, ITracer.Phase ph, int pid, long tid, ITracer.Scope scope, + public static Event create(String name, long cat, ITracer.Phase ph, long pid, long tid, ITracer.Scope scope, String args, TraceCategoryRegistry registry) { return new Event(name, cat, ph, timestamp(), pid, tid, scope, args, registry); } diff --git a/hyracks-fullstack/hyracks/hyracks-util/src/main/java/org/apache/hyracks/util/trace/Tracer.java b/hyracks-fullstack/hyracks/hyracks-util/src/main/java/org/apache/hyracks/util/trace/Tracer.java index 9019fdf..c1c38cf 100644 --- a/hyracks-fullstack/hyracks/hyracks-util/src/main/java/org/apache/hyracks/util/trace/Tracer.java +++ b/hyracks-fullstack/hyracks/hyracks-util/src/main/java/org/apache/hyracks/util/trace/Tracer.java @@ -44,7 +44,7 @@ private long categories; private final TraceCategoryRegistry registry; - private static final int pid = PidHelper.getPid(); + private static final long pid = PidHelper.getPid(); public Tracer(String name, long categories, TraceCategoryRegistry registry) { final String traceLoggerName = Tracer.class.getName() + ".Traces." + name; -- To view, visit https://asterix-gerrit.ics.uci.edu/3312 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic2371171dfc01423921c2e2d04fbc68a38978f2e Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Michael Blow <[email protected]>
