This is an automated email from the ASF dual-hosted git repository.
zhouky pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-celeborn.git
The following commit(s) were added to refs/heads/main by this push:
new 789dd35ad [CELEBORN-1065] Prevent the local variable 'time' declared
in one 'switch' branch and used in another
789dd35ad is described below
commit 789dd35ad937ad21e10e41cc3e00f2beb7bb676f
Author: liangbowen <[email protected]>
AuthorDate: Sun Oct 22 22:52:02 2023 +0800
[CELEBORN-1065] Prevent the local variable 'time' declared in one 'switch'
branch and used in another
### What changes were proposed in this pull request?
- Minor code improvement in `MetaHandler`
- Local variable 'time' declared in one 'switch' branch `AppHeartbeat`
and used in another branch `WorkerHeartbeat`
### Why are the changes needed?
- Incorrect code pattern.
### Does this PR introduce _any_ user-facing change?
No.
### How was this patch tested?
CI tests.
Closes #2012 from bowenliang123/time.
Authored-by: liangbowen <[email protected]>
Signed-off-by: zky.zhoukeyong <[email protected]>
---
.../celeborn/service/deploy/master/clustermeta/ha/MetaHandler.java | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git
a/master/src/main/java/org/apache/celeborn/service/deploy/master/clustermeta/ha/MetaHandler.java
b/master/src/main/java/org/apache/celeborn/service/deploy/master/clustermeta/ha/MetaHandler.java
index 2bbc8ab44..533d10016 100644
---
a/master/src/main/java/org/apache/celeborn/service/deploy/master/clustermeta/ha/MetaHandler.java
+++
b/master/src/main/java/org/apache/celeborn/service/deploy/master/clustermeta/ha/MetaHandler.java
@@ -173,7 +173,6 @@ public class MetaHandler {
replicatePort,
diskInfos,
userResourceConsumption);
- time = request.getWorkerHeartbeatRequest().getTime();
metaSystem.updateWorkerHeartbeatMeta(
host,
rpcPort,
@@ -183,7 +182,7 @@ public class MetaHandler {
diskInfos,
userResourceConsumption,
estimatedAppDiskUsage,
- time,
+ request.getWorkerHeartbeatRequest().getTime(),
highWorkload);
break;