This is an automated email from the ASF dual-hosted git repository.
wlo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/gobblin.git
The following commit(s) were added to refs/heads/master by this push:
new 68e25904a [GOBBLIN-1858] Fix logs relating to multi-active lease
arbiter (#3720)
68e25904a is described below
commit 68e25904af3ec0f07bf4099208b18678aaba038c
Author: umustafi <[email protected]>
AuthorDate: Tue Jul 25 10:24:00 2023 -0700
[GOBBLIN-1858] Fix logs relating to multi-active lease arbiter (#3720)
Co-authored-by: Urmi Mustafi <[email protected]>
---
.../org/apache/gobblin/runtime/api/MysqlMultiActiveLeaseArbiter.java | 4 ++--
.../gobblin/service/modules/orchestration/FlowTriggerHandler.java | 4 ++--
.../apache/gobblin/service/modules/orchestration/Orchestrator.java | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git
a/gobblin-runtime/src/main/java/org/apache/gobblin/runtime/api/MysqlMultiActiveLeaseArbiter.java
b/gobblin-runtime/src/main/java/org/apache/gobblin/runtime/api/MysqlMultiActiveLeaseArbiter.java
index 9318d8b56..88f143a3b 100644
---
a/gobblin-runtime/src/main/java/org/apache/gobblin/runtime/api/MysqlMultiActiveLeaseArbiter.java
+++
b/gobblin-runtime/src/main/java/org/apache/gobblin/runtime/api/MysqlMultiActiveLeaseArbiter.java
@@ -450,13 +450,13 @@ public class MysqlMultiActiveLeaseArbiter implements
MultiActiveLeaseArbiter {
updateStatement.setTimestamp(++i, new
Timestamp(status.getLeaseAcquisitionTimestamp()));
int numRowsUpdated = updateStatement.executeUpdate();
if (numRowsUpdated == 0) {
- log.info("Multi-active lease arbiter lease attempt: [%s,
eventTimestamp: %s] - FAILED to complete because "
+ log.info("Multi-active lease arbiter lease attempt: [{},
eventTimestamp: {}] - FAILED to complete because "
+ "lease expired or event cleaned up before host completed
required actions", flowAction,
status.getEventTimestamp());
return false;
}
if( numRowsUpdated == 1) {
- log.info("Multi-active lease arbiter lease attempt: [%s,
eventTimestamp: %s] - COMPLETED, no longer leasing"
+ log.info("Multi-active lease arbiter lease attempt: [{},
eventTimestamp: {}] - COMPLETED, no longer leasing"
+ " this event after this.", flowAction,
status.getEventTimestamp());
return true;
};
diff --git
a/gobblin-service/src/main/java/org/apache/gobblin/service/modules/orchestration/FlowTriggerHandler.java
b/gobblin-service/src/main/java/org/apache/gobblin/service/modules/orchestration/FlowTriggerHandler.java
index 7fdee0384..90379e730 100644
---
a/gobblin-service/src/main/java/org/apache/gobblin/service/modules/orchestration/FlowTriggerHandler.java
+++
b/gobblin-service/src/main/java/org/apache/gobblin/service/modules/orchestration/FlowTriggerHandler.java
@@ -181,11 +181,11 @@ public class FlowTriggerHandler {
// Create a new trigger for the flow in job scheduler that is set to fire
at the minimum reminder wait time calculated
Trigger trigger = JobScheduler.createTriggerForJob(key, jobProps);
try {
- log.info("Flow Trigger Handler - [%s, eventTimestamp: %s] - attempting
to schedule reminder for event %s in %s millis",
+ log.info("Flow Trigger Handler - [{}, eventTimestamp: {}] - attempting
to schedule reminder for event {} in {} millis",
flowAction, originalEventTimeMillis, status.getEventTimeMillis(),
trigger.getNextFireTime());
this.schedulerService.getScheduler().scheduleJob(trigger);
} catch (SchedulerException e) {
- log.warn("Failed to add job reminder due to SchedulerException for job
%s trigger event %s ", key, status.getEventTimeMillis(), e);
+ log.warn("Failed to add job reminder due to SchedulerException for job
{} trigger event {} ", key, status.getEventTimeMillis(), e);
}
log.info(String.format("Flow Trigger Handler - [%s, eventTimestamp: %s] -
SCHEDULED REMINDER for event %s in %s millis",
flowAction, originalEventTimeMillis, status.getEventTimeMillis(),
trigger.getNextFireTime()));
diff --git
a/gobblin-service/src/main/java/org/apache/gobblin/service/modules/orchestration/Orchestrator.java
b/gobblin-service/src/main/java/org/apache/gobblin/service/modules/orchestration/Orchestrator.java
index a0c196789..84521087b 100644
---
a/gobblin-service/src/main/java/org/apache/gobblin/service/modules/orchestration/Orchestrator.java
+++
b/gobblin-service/src/main/java/org/apache/gobblin/service/modules/orchestration/Orchestrator.java
@@ -329,7 +329,7 @@ public class Orchestrator implements SpecCatalogListener,
Instrumentable {
DagActionStore.DagAction flowAction =
new DagActionStore.DagAction(flowGroup, flowName, flowExecutionId,
DagActionStore.FlowActionType.LAUNCH);
flowTriggerHandler.get().handleTriggerEvent(jobProps, flowAction,
triggerTimestampMillis);
- _log.info("Multi-active scheduler finished handling trigger event:
[%s, triggerEventTimestamp: %s]", flowAction,
+ _log.info("Multi-active scheduler finished handling trigger event:
[{}, triggerEventTimestamp: {}]", flowAction,
triggerTimestampMillis);
} else if (this.dagManager.isPresent()) {
submitFlowToDagManager((FlowSpec) spec, jobExecutionPlanDag);