From bd7e057672ff9adb95ca3b5d9719328d1765895c Mon Sep 17 00:00:00 2001 From: baoloongmao Date: Tue, 31 Dec 2024 09:07:40 +0800 Subject: [PATCH] Fix config name --- .../java/org/apache/uniffle/server/ShuffleServerConf.java | 6 +----- .../org/apache/uniffle/server/ShuffleServerGrpcService.java | 4 ++-- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/server/src/main/java/org/apache/uniffle/server/ShuffleServerConf.java b/server/src/main/java/org/apache/uniffle/server/ShuffleServerConf.java index 97c771ba27..d197b82860 100644 --- a/server/src/main/java/org/apache/uniffle/server/ShuffleServerConf.java +++ b/server/src/main/java/org/apache/uniffle/server/ShuffleServerConf.java @@ -765,11 +765,7 @@ public class ShuffleServerConf extends RssBaseConf { .stringType() .defaultValue(LocalStorageManager.class.getName()) .withDescription("The class of local storage manager implementation"); - public static final ConfigOption SERVER_TRIGGER_REPORT_WHILE_UNREGISTER_ENABLED = - ConfigOptions.key("rss.server.heartbeatReportOnUnregisterEnabled") - .booleanType() - .defaultValue(false) - .withDescription("Whether to trigger report while unregister"); + public static final ConfigOption SERVER_HEARTBEAT_REPORT_ON_UNREGISTER_ENABLED = ConfigOptions.key("rss.server.heartbeatReportOnUnregisterEnabled") .booleanType() diff --git a/server/src/main/java/org/apache/uniffle/server/ShuffleServerGrpcService.java b/server/src/main/java/org/apache/uniffle/server/ShuffleServerGrpcService.java index 2825c42d9c..9d762190c4 100644 --- a/server/src/main/java/org/apache/uniffle/server/ShuffleServerGrpcService.java +++ b/server/src/main/java/org/apache/uniffle/server/ShuffleServerGrpcService.java @@ -170,7 +170,7 @@ public void unregisterShuffleByAppId( try { if (shuffleServer .getShuffleServerConf() - .getBoolean(ShuffleServerConf.SERVER_TRIGGER_REPORT_WHILE_UNREGISTER_ENABLED)) { + .getBoolean(ShuffleServerConf.SERVER_HEARTBEAT_REPORT_ON_UNREGISTER_ENABLED)) { shuffleServer.sendHeartbeat(); } shuffleServer.getShuffleTaskManager().removeShuffleDataAsync(appId); @@ -217,7 +217,7 @@ public void unregisterShuffle( try { if (shuffleServer .getShuffleServerConf() - .getBoolean(ShuffleServerConf.SERVER_TRIGGER_REPORT_WHILE_UNREGISTER_ENABLED)) { + .getBoolean(ShuffleServerConf.SERVER_HEARTBEAT_REPORT_ON_UNREGISTER_ENABLED)) { shuffleServer.sendHeartbeat(); } shuffleServer.getShuffleTaskManager().removeShuffleDataAsync(appId, shuffleId);