You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by me...@apache.org on 2021/01/06 12:38:10 UTC
[shardingsphere] branch master updated: Add jobId for
ScalingCallback (#8920)
This is an automated email from the ASF dual-hosted git repository.
menghaoran pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git
The following commit(s) were added to refs/heads/master by this push:
new 1f74306 Add jobId for ScalingCallback (#8920)
1f74306 is described below
commit 1f74306e10b7a50e90b4af7f8a44148fdc231256
Author: 邱鹿 Lucas <lu...@163.com>
AuthorDate: Wed Jan 6 20:37:39 2021 +0800
Add jobId for ScalingCallback (#8920)
* Add jobId for ScalingCallback
* Add jobId for ScalingCallback
Co-authored-by: qiulu3 <Lucas209910>
---
.../governance/core/scaling/callback/ScalingResultCallback.java | 4 ++--
.../scaling/core/service/AbstractScalingJobService.java | 4 ++--
.../shardingsphere/scaling/core/service/ScalingCallback.java | 8 ++++++--
.../core/service/impl/DistributedScalingJobServiceTest.java | 4 ++--
4 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/scaling/callback/ScalingResultCallback.java b/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/scaling/callback/ScalingResultCallback.java
index 54a0340..a349e93 100644
--- a/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/scaling/callback/ScalingResultCallback.java
+++ b/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/scaling/callback/ScalingResultCallback.java
@@ -36,12 +36,12 @@ public final class ScalingResultCallback implements ScalingCallback {
}
@Override
- public void onSuccess() {
+ public void onSuccess(final long jobId) {
ShardingSphereEventBus.getInstance().post(new SwitchRuleConfigurationEvent(schemaName, ruleConfigurationCacheId));
}
@Override
- public void onFailure() {
+ public void onFailure(final long jobId) {
// TODO
}
}
diff --git a/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/service/AbstractScalingJobService.java b/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/service/AbstractScalingJobService.java
index d876b59..ee31f87 100644
--- a/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/service/AbstractScalingJobService.java
+++ b/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/service/AbstractScalingJobService.java
@@ -97,10 +97,10 @@ public abstract class AbstractScalingJobService implements ScalingJobService {
JobProgress jobProgress = getProgress(scalingJob.getJobId());
if (jobProgress.getStatus().contains("FAILURE")) {
finished = true;
- scalingCallback.onFailure();
+ scalingCallback.onFailure(scalingJob.getJobId());
} else if (ScalingTaskUtil.allTasksAlmostFinished(jobProgress, scalingJob.getScalingConfig().getJobConfiguration())) {
finished = true;
- scalingCallback.onSuccess();
+ scalingCallback.onSuccess(scalingJob.getJobId());
}
}
}
diff --git a/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/service/ScalingCallback.java b/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/service/ScalingCallback.java
index b20eba2..ee94de0 100644
--- a/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/service/ScalingCallback.java
+++ b/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/service/ScalingCallback.java
@@ -24,11 +24,15 @@ public interface ScalingCallback {
/**
* Callback when execute success.
+ *
+ * @param jobId job id
*/
- void onSuccess();
+ void onSuccess(long jobId);
/**
* Callback when execute failure.
+ *
+ * @param jobId job id
*/
- void onFailure();
+ void onFailure(long jobId);
}
diff --git a/shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/service/impl/DistributedScalingJobServiceTest.java b/shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/service/impl/DistributedScalingJobServiceTest.java
index b4b1e62..cb5e66d 100644
--- a/shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/service/impl/DistributedScalingJobServiceTest.java
+++ b/shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/service/impl/DistributedScalingJobServiceTest.java
@@ -149,11 +149,11 @@ public final class DistributedScalingJobServiceTest {
return new ScalingCallback() {
@Override
- public void onSuccess() {
+ public void onSuccess(final long jobId) {
}
@Override
- public void onFailure() {
+ public void onFailure(final long jobId) {
}
};
}