>From Michael Blow <[email protected]>:
Michael Blow has uploaded this change for review. (
https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18358 )
Change subject: Merge branch 'gerrit/neo' into 'gerrit/trinity'
......................................................................
Merge branch 'gerrit/neo' into 'gerrit/trinity'
Change-Id: I7ee726406bf54a998b3c33ed54844e2d6dc0c5c0
---
M
asterixdb/asterix-app/src/main/java/org/apache/asterix/app/active/ActiveNotificationHandler.java
M
asterixdb/asterix-active/src/main/java/org/apache/asterix/active/ActiveManager.java
M
hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/work/JobStartWork.java
M
hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/work/CleanupJobletWork.java
M
hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/work/NotifyTaskCompleteWork.java
6 files changed, 23 insertions(+), 30 deletions(-)
git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb
refs/changes/58/18358/1
diff --git
a/asterixdb/asterix-active/src/main/java/org/apache/asterix/active/ActiveManager.java
b/asterixdb/asterix-active/src/main/java/org/apache/asterix/active/ActiveManager.java
index 06b611d..2720510 100644
---
a/asterixdb/asterix-active/src/main/java/org/apache/asterix/active/ActiveManager.java
+++
b/asterixdb/asterix-active/src/main/java/org/apache/asterix/active/ActiveManager.java
@@ -103,21 +103,18 @@
return ActiveManager.class.getSimpleName() + "[" + nodeId + "]";
}
-<<<<<<< HEAD (b4120d Merge branch 'gerrit/neo' into 'gerrit/trinity')
public void handle(ActiveManagerMessage message) throws
HyracksDataException {
- LOGGER.debug("NC handling {}({})({})", message.getKind(),
message.getRuntimeId(), message.getDesc());
-=======
- public void submit(ActiveManagerMessage message) throws
HyracksDataException {
->>>>>>> BRANCH (9b4dbe [NO ISSUE][TEST] Fix tests, remove reflection)
switch (message.getKind()) {
case STOP_ACTIVITY:
- LOGGER.debug("Message of type {} received in {}",
message.getKind(), nodeId);
+ logHandle(Level.DEBUG, message);
stopRuntime(message);
break;
case REQUEST_STATS:
+ logHandle(Level.TRACE, message);
requestStats((ActiveStatsRequestMessage) message);
break;
case GENERIC_EVENT:
+ logHandle(Level.DEBUG, message);
deliverGenericEvent(message);
break;
default:
@@ -125,6 +122,10 @@
}
}
+ private void logHandle(Level level, ActiveManagerMessage message) {
+ LOGGER.log(level, "NC handling {}({})({})", message.getKind(),
message.getRuntimeId(), message.getDesc());
+ }
+
private void deliverGenericEvent(ActiveManagerMessage message) throws
HyracksDataException {
try {
ActiveRuntimeId runtimeId = message.getRuntimeId();
diff --git
a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/active/ActiveNotificationHandler.java
b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/active/ActiveNotificationHandler.java
index d93ec1c..5fe082b 100644
---
a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/active/ActiveNotificationHandler.java
+++
b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/active/ActiveNotificationHandler.java
@@ -107,20 +107,13 @@
private synchronized void monitorJob(JobId jobId, EntityId entityId) {
boolean found = jobId2EntityId.containsKey(jobId);
-<<<<<<< HEAD (b4120d Merge branch 'gerrit/neo' into 'gerrit/trinity')
LOGGER.debug("{} is {}", jobId, (found ? "active" : "inactive"));
-=======
- LOGGER.debug("{} was {}", jobId, (found ? "active" : "inactive"));
->>>>>>> BRANCH (9b4dbe [NO ISSUE][TEST] Fix tests, remove reflection)
if (entityEventListeners.containsKey(entityId)) {
if (found) {
LOGGER.error("{} is already being monitored", jobId);
return;
}
-<<<<<<< HEAD (b4120d Merge branch 'gerrit/neo' into 'gerrit/trinity')
LOGGER.debug("monitoring started for {}", jobId);
-=======
->>>>>>> BRANCH (9b4dbe [NO ISSUE][TEST] Fix tests, remove reflection)
} else {
LOGGER.debug("no listener found for entity {}; {}", entityId,
jobId);
}
@@ -137,13 +130,8 @@
}
@Override
-<<<<<<< HEAD (b4120d Merge branch 'gerrit/neo' into 'gerrit/trinity')
public synchronized void notifyJobFinish(JobId jobId, JobSpecification
spec, JobStatus jobStatus,
List<Exception> exceptions) throws HyracksException {
-=======
- public synchronized void notifyJobFinish(JobId jobId, JobStatus jobStatus,
List<Exception> exceptions)
- throws HyracksException {
->>>>>>> BRANCH (9b4dbe [NO ISSUE][TEST] Fix tests, remove reflection)
EntityId entityId = jobId2EntityId.get(jobId);
if (entityId != null) {
LOGGER.debug("notified of ingestion job finish {}", jobId);
diff --git
a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/work/JobStartWork.java
b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/work/JobStartWork.java
index dee2935..86e36d6 100644
---
a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/work/JobStartWork.java
+++
b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/work/JobStartWork.java
@@ -36,11 +36,8 @@
import org.apache.hyracks.control.common.work.IResultCallback;
import org.apache.hyracks.control.common.work.SynchronizableWork;
import org.apache.logging.log4j.Level;
-<<<<<<< HEAD (b4120d Merge branch 'gerrit/neo' into 'gerrit/trinity')
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
-=======
->>>>>>> BRANCH (9b4dbe [NO ISSUE][TEST] Fix tests, remove reflection)
public class JobStartWork extends SynchronizableWork {
diff --git
a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/work/CleanupJobletWork.java
b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/work/CleanupJobletWork.java
index 50d960d..2036d72 100644
---
a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/work/CleanupJobletWork.java
+++
b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/work/CleanupJobletWork.java
@@ -47,11 +47,7 @@
@Override
public void run() {
-<<<<<<< HEAD (b4120d Merge branch 'gerrit/neo' into 'gerrit/trinity')
- LOGGER.debug("cleaning up {}", jobId);
-=======
LOGGER.debug("cleaning up {}, status:{}", jobId, status);
->>>>>>> BRANCH (9b4dbe [NO ISSUE][TEST] Fix tests, remove reflection)
ncs.removeJobParameterByteStore(jobId);
ncs.getPartitionManager().jobCompleted(jobId, status);
Map<JobId, Joblet> jobletMap = ncs.getJobletMap();
diff --git
a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/work/NotifyTaskCompleteWork.java
b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/work/NotifyTaskCompleteWork.java
index 9c34b6e..7e1b6f5 100644
---
a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/work/NotifyTaskCompleteWork.java
+++
b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/work/NotifyTaskCompleteWork.java
@@ -63,9 +63,4 @@
public Level logLevel() {
return Level.TRACE;
}
-
- @Override
- public Level logLevel() {
- return Level.TRACE;
- }
}
--
To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18358
To unsubscribe, or for help writing mail filters, visit
https://asterix-gerrit.ics.uci.edu/settings
Gerrit-Project: asterixdb
Gerrit-Branch: trinity
Gerrit-Change-Id: I7ee726406bf54a998b3c33ed54844e2d6dc0c5c0
Gerrit-Change-Number: 18358
Gerrit-PatchSet: 1
Gerrit-Owner: Michael Blow <[email protected]>
Gerrit-MessageType: newchange
