>From Ali Alsuliman <[email protected]>:
Ali Alsuliman has uploaded this change for review. (
https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18354 )
Change subject: Merge branch 'gerrit/stabilization-40cfb8705b' into 'gerrit/neo'
......................................................................
Merge branch 'gerrit/stabilization-40cfb8705b' into 'gerrit/neo'
Change-Id: Ia8359d2d0d8e1b39b1f2c15e5f367332671f9df2
---
M
asterixdb/asterix-app/src/main/java/org/apache/asterix/app/active/ActiveEntityEventsListener.java
M
asterixdb/asterix-app/src/main/java/org/apache/asterix/app/active/ActiveNotificationHandler.java
M
hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/job/JobManager.java
M
asterixdb/asterix-app/src/main/java/org/apache/asterix/app/message/CancelQueryResponse.java
M
asterixdb/asterix-app/src/main/java/org/apache/asterix/app/message/CancelQueryRequest.java
M
hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/work/JobCleanupWork.java
M
hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/partitions/PartitionMatchMaker.java
M
hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/work/TaskFailureWork.java
9 files changed, 16 insertions(+), 84 deletions(-)
git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb
refs/changes/54/18354/1
diff --git
a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/active/ActiveEntityEventsListener.java
b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/active/ActiveEntityEventsListener.java
index d3bd636..7b253f1 100644
---
a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/active/ActiveEntityEventsListener.java
+++
b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/active/ActiveEntityEventsListener.java
@@ -501,11 +501,7 @@
ICCMessageBroker messageBroker = (ICCMessageBroker)
applicationCtx.getServiceContext().getMessageBroker();
AlgebricksAbsolutePartitionConstraint runtimeLocations =
getLocations();
int partition = 0;
-<<<<<<< HEAD (5b4e88 Merge branch 'gerrit/stabilization-40cfb8705b' into
'gerrit/)
- LOGGER.log(Level.INFO, "Sending stop messages to {}",
runtimeLocations);
-=======
LOGGER.log(Level.INFO, "sending stop messages to {}",
runtimeLocations);
->>>>>>> BRANCH (f12459 [NO ISSUE][OTH] Logging enhancements + query job
logging)
for (String location : runtimeLocations.getLocations()) {
ActiveRuntimeId runtimeId = getActiveRuntimeId(partition++);
messageBroker.sendApplicationMessageToNC(new
ActiveManagerMessage(ActiveManagerMessage.Kind.STOP_ACTIVITY,
@@ -568,19 +564,10 @@
WaitForStateSubscriber subscriber;
Future<Void> suspendTask;
synchronized (this) {
-<<<<<<< HEAD (5b4e88 Merge branch 'gerrit/stabilization-40cfb8705b' into
'gerrit/)
- LOGGER.log(level, "{} Suspending entity {}", jobId, entityId);
- LOGGER.log(level, "{} Waiting for ongoing activities", jobId);
-=======
LOGGER.log(level, "{} suspending entity {}", jobId, entityId);
LOGGER.log(level, "{} waiting for ongoing activities", jobId);
->>>>>>> BRANCH (f12459 [NO ISSUE][OTH] Logging enhancements + query job
logging)
waitForNonTransitionState();
-<<<<<<< HEAD (5b4e88 Merge branch 'gerrit/stabilization-40cfb8705b' into
'gerrit/)
- LOGGER.log(level, "{} Proceeding with suspension. Current state is
{}", jobId, state);
-=======
LOGGER.log(level, "{} proceeding with suspension. current state is
{}", jobId, state);
->>>>>>> BRANCH (f12459 [NO ISSUE][OTH] Logging enhancements + query job
logging)
if (state == ActivityState.STOPPED) {
suspended = true;
return;
@@ -601,24 +588,12 @@
doSuspend(metadataProvider);
return null;
});
-<<<<<<< HEAD (5b4e88 Merge branch 'gerrit/stabilization-40cfb8705b' into
'gerrit/)
- LOGGER.log(level, "{} Suspension task has been submitted", jobId);
-=======
LOGGER.log(level, "{} suspension task has been submitted", jobId);
->>>>>>> BRANCH (f12459 [NO ISSUE][OTH] Logging enhancements + query job
logging)
}
try {
-<<<<<<< HEAD (5b4e88 Merge branch 'gerrit/stabilization-40cfb8705b' into
'gerrit/)
- LOGGER.log(level, "{} Waiting for suspension task to complete",
jobId);
-=======
LOGGER.log(level, "{} waiting for suspension task to complete",
jobId);
->>>>>>> BRANCH (f12459 [NO ISSUE][OTH] Logging enhancements + query job
logging)
suspendTask.get();
-<<<<<<< HEAD (5b4e88 Merge branch 'gerrit/stabilization-40cfb8705b' into
'gerrit/)
- LOGGER.log(level, "{} Waiting for state to become SUSPENDED or
TEMPORARILY_FAILED", jobId);
-=======
LOGGER.log(level, "{} waiting for state to become SUSPENDED or
TEMPORARILY_FAILED", jobId);
->>>>>>> BRANCH (f12459 [NO ISSUE][OTH] Logging enhancements + query job
logging)
subscriber.sync();
suspended = true;
} catch (Exception e) {
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 8fcdb17..662884d 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
@@ -93,11 +93,7 @@
Object property =
jobSpecification.getProperty(ACTIVE_ENTITY_PROPERTY_NAME);
if (!(property instanceof EntityId)) {
if (property != null) {
-<<<<<<< HEAD (5b4e88 Merge branch 'gerrit/stabilization-40cfb8705b' into
'gerrit/)
- LOGGER.debug("{} is not an active job. job property={}",
jobId, property);
-=======
LOGGER.debug("{} is not an ingestion job. job property={}",
jobId, property);
->>>>>>> BRANCH (f12459 [NO ISSUE][OTH] Logging enhancements + query job
logging)
}
return;
}
diff --git
a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/message/CancelQueryRequest.java
b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/message/CancelQueryRequest.java
index bff3eff..6570041 100644
---
a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/message/CancelQueryRequest.java
+++
b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/message/CancelQueryRequest.java
@@ -82,12 +82,7 @@
@Override
public String toString() {
-<<<<<<< HEAD (5b4e88 Merge branch 'gerrit/stabilization-40cfb8705b' into
'gerrit/)
- return String.format("%s(id=%s, uuid=%s, contextId=%s, node=%s)",
getClass().getSimpleName(), reqId, uuid,
- contextId, nodeId);
-=======
return "CancelQueryRequest{from='" + nodeId + "', reqId=" + reqId + ",
uuid='" + uuid + "', contextId='"
+ contextId + "'}";
->>>>>>> BRANCH (f12459 [NO ISSUE][OTH] Logging enhancements + query job
logging)
}
}
diff --git
a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/message/CancelQueryResponse.java
b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/message/CancelQueryResponse.java
index 71a1aa4..68d3430 100644
---
a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/message/CancelQueryResponse.java
+++
b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/message/CancelQueryResponse.java
@@ -51,10 +51,6 @@
@Override
public String toString() {
-<<<<<<< HEAD (5b4e88 Merge branch 'gerrit/stabilization-40cfb8705b' into
'gerrit/)
- return String.format("%s(id=%s, status=%s)",
getClass().getSimpleName(), reqId, status);
-=======
return "CancelQueryResponse{reqId=" + reqId + ", status=" + status +
'}';
->>>>>>> BRANCH (f12459 [NO ISSUE][OTH] Logging enhancements + query job
logging)
}
}
diff --git
a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/job/JobManager.java
b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/job/JobManager.java
index 0108b72..ad97188 100644
---
a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/job/JobManager.java
+++
b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/job/JobManager.java
@@ -314,11 +314,7 @@
run.setStartTime(System.currentTimeMillis());
run.setStartTimeZoneId(ZoneId.systemDefault().getId());
JobId jobId = run.getJobId();
-<<<<<<< HEAD (5b4e88 Merge branch 'gerrit/stabilization-40cfb8705b' into
'gerrit/)
- logJobCapacity(run, "running");
-=======
logJobCapacity(run, "running", Level.DEBUG);
->>>>>>> BRANCH (f12459 [NO ISSUE][OTH] Logging enhancements + query job
logging)
activeRunMap.put(jobId, run);
run.setStatus(JobStatus.RUNNING, null);
executeJobInternal(run);
@@ -326,11 +322,7 @@
// Queue a job when the required capacity for the job is not met.
private void queueJob(JobRun jobRun) throws HyracksException {
-<<<<<<< HEAD (5b4e88 Merge branch 'gerrit/stabilization-40cfb8705b' into
'gerrit/)
- logJobCapacity(jobRun, "queueing");
-=======
logJobCapacity(jobRun, "queueing", Level.INFO);
->>>>>>> BRANCH (f12459 [NO ISSUE][OTH] Logging enhancements + query job
logging)
jobRun.setStatus(JobStatus.PENDING, null);
jobQueue.add(jobRun);
}
@@ -366,23 +358,6 @@
private void releaseJobCapacity(JobRun jobRun) {
final JobSpecification job = jobRun.getJobSpecification();
jobCapacityController.release(job);
-<<<<<<< HEAD (5b4e88 Merge branch 'gerrit/stabilization-40cfb8705b' into
'gerrit/)
- logJobCapacity(jobRun, "released");
- }
-
- private void logJobCapacity(JobRun jobRun, String jobStateDesc) {
- IClusterCapacity requiredResources =
jobRun.getJobSpecification().getRequiredClusterCapacity();
- if (requiredResources == null) {
- return;
- }
- long requiredMemory = requiredResources.getAggregatedMemoryByteSize();
- int requiredCPUs = requiredResources.getAggregatedCores();
- if (requiredMemory == 0 && requiredCPUs == 0) {
- return;
- }
- IReadOnlyClusterCapacity clusterCapacity =
jobCapacityController.getClusterCapacity();
- LOGGER.info("{} {}, memory={}, cpu={}, (new) cluster memory={},
cpu={}, currently running={}, queued={}",
-=======
logJobCapacity(jobRun, "released", Level.DEBUG);
}
@@ -398,7 +373,6 @@
}
IReadOnlyClusterCapacity clusterCapacity =
jobCapacityController.getClusterCapacity();
LOGGER.log(lvl, "{} {}, memory={}, cpu={}, (new) cluster memory={},
cpu={}, currently running={}, queued={}",
->>>>>>> BRANCH (f12459 [NO ISSUE][OTH] Logging enhancements + query job
logging)
jobStateDesc, jobRun.getJobId(), requiredMemory, requiredCPUs,
clusterCapacity.getAggregatedMemoryByteSize(),
clusterCapacity.getAggregatedCores(),
getRunningJobsCount(), jobQueue.size());
diff --git
a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/partitions/PartitionMatchMaker.java
b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/partitions/PartitionMatchMaker.java
index 365108a..6278693 100644
---
a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/partitions/PartitionMatchMaker.java
+++
b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/partitions/PartitionMatchMaker.java
@@ -149,15 +149,9 @@
removeEntries(partitionRequests, o ->
deadNodes.contains(o.getNodeId()));
}
-<<<<<<< HEAD (5b4e88 Merge branch 'gerrit/stabilization-40cfb8705b' into
'gerrit/)
public void removeUncommittedPartitions(Set<PartitionId> partitionIds,
Set<TaskAttemptId> taIds, JobId jobId) {
- if (!partitionIds.isEmpty()) {
- LOGGER.debug("Removing uncommitted partitions {}: {}", jobId,
partitionIds);
-=======
- public void removeUncommittedPartitions(Set<PartitionId> partitionIds,
final Set<TaskAttemptId> taIds) {
if (partitionIds != null && !partitionIds.isEmpty()) {
- LOGGER.debug("Removing uncommitted partitions {}", partitionIds);
->>>>>>> BRANCH (f12459 [NO ISSUE][OTH] Logging enhancements + query job
logging)
+ LOGGER.debug("Removing uncommitted partitions {}: {}", jobId,
partitionIds);
}
IEntryFilter<PartitionDescriptor> filter =
o -> o.getState() != PartitionState.COMMITTED &&
taIds.contains(o.getProducingTaskAttemptId());
@@ -172,15 +166,9 @@
}
}
-<<<<<<< HEAD (5b4e88 Merge branch 'gerrit/stabilization-40cfb8705b' into
'gerrit/)
public void removePartitionRequests(Set<PartitionId> partitionIds,
Set<TaskAttemptId> taIds, JobId jobId) {
- if (!partitionIds.isEmpty()) {
- LOGGER.debug("Removing partition requests {}: {}", jobId,
partitionIds);
-=======
- public void removePartitionRequests(Set<PartitionId> partitionIds, final
Set<TaskAttemptId> taIds) {
if (partitionIds != null && !partitionIds.isEmpty()) {
- LOGGER.debug("Removing partition requests {}", partitionIds);
->>>>>>> BRANCH (f12459 [NO ISSUE][OTH] Logging enhancements + query job
logging)
+ LOGGER.debug("Removing partition requests {}: {}", jobId,
partitionIds);
}
IEntryFilter<PartitionRequest> filter = o ->
taIds.contains(o.getRequestingTaskAttemptId());
for (PartitionId pid : partitionIds) {
diff --git
a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/work/JobCleanupWork.java
b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/work/JobCleanupWork.java
index 49997af..6fe9909 100644
---
a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/work/JobCleanupWork.java
+++
b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/work/JobCleanupWork.java
@@ -53,10 +53,7 @@
@Override
public void run() {
-<<<<<<< HEAD (5b4e88 Merge branch 'gerrit/stabilization-40cfb8705b' into
'gerrit/)
-=======
LOGGER.info("cleaning up {} on NCs, status={}", jobId, status);
->>>>>>> BRANCH (f12459 [NO ISSUE][OTH] Logging enhancements + query job
logging)
final JobRun jobRun = jobManager.get(jobId);
if (jobRun == null) {
LOGGER.debug("ignoring cleanup for unknown {}", jobId);
diff --git
a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/work/TaskFailureWork.java
b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/work/TaskFailureWork.java
index 5b5de12..48fd403 100644
---
a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/work/TaskFailureWork.java
+++
b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/work/TaskFailureWork.java
@@ -22,10 +22,7 @@
import org.apache.hyracks.api.dataflow.TaskAttemptId;
import org.apache.hyracks.api.job.JobId;
-<<<<<<< HEAD (5b4e88 Merge branch 'gerrit/stabilization-40cfb8705b' into
'gerrit/)
-=======
import org.apache.hyracks.api.util.ErrorMessageUtil;
->>>>>>> BRANCH (f12459 [NO ISSUE][OTH] Logging enhancements + query job
logging)
import org.apache.hyracks.control.cc.ClusterControllerService;
import org.apache.hyracks.control.cc.job.IJobManager;
import org.apache.hyracks.control.cc.job.JobRun;
--
To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18354
To unsubscribe, or for help writing mail filters, visit
https://asterix-gerrit.ics.uci.edu/settings
Gerrit-Project: asterixdb
Gerrit-Branch: neo
Gerrit-Change-Id: Ia8359d2d0d8e1b39b1f2c15e5f367332671f9df2
Gerrit-Change-Number: 18354
Gerrit-PatchSet: 1
Gerrit-Owner: Ali Alsuliman <[email protected]>
Gerrit-MessageType: newchange
