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 6cd135548 [CELEBORN-726][FOLLOWUP] Amend method names
6cd135548 is described below
commit 6cd1355488c74e2f82acea6c9f6da1b197c42dea
Author: zky.zhoukeyong <[email protected]>
AuthorDate: Mon Jul 31 20:14:41 2023 +0800
[CELEBORN-726][FOLLOWUP] Amend method names
### What changes were proposed in this pull request?
As title
### Why are the changes needed?
As title
### Does this PR introduce _any_ user-facing change?
No
### How was this patch tested?
Passes GA
Closes #1776 from waitinfuture/method.
Authored-by: zky.zhoukeyong <[email protected]>
Signed-off-by: zky.zhoukeyong <[email protected]>
---
.../org/apache/celeborn/client/LifecycleManager.scala | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git
a/client/src/main/scala/org/apache/celeborn/client/LifecycleManager.scala
b/client/src/main/scala/org/apache/celeborn/client/LifecycleManager.scala
index 00c2c4847..5dbaa95aa 100644
--- a/client/src/main/scala/org/apache/celeborn/client/LifecycleManager.scala
+++ b/client/src/main/scala/org/apache/celeborn/client/LifecycleManager.scala
@@ -398,7 +398,7 @@ class LifecycleManager(val appUniqueId: String, val conf:
CelebornConf) extends
// First, request to get allocated slots from Primary
val ids = new util.ArrayList[Integer](numPartitions)
(0 until numPartitions).foreach(idx => ids.add(Integer.valueOf(idx)))
- val res = requestPrimaryRequestSlotsWithRetry(shuffleId, ids)
+ val res = requestMasterRequestSlotsWithRetry(shuffleId, ids)
res.status match {
case StatusCode.REQUEST_FAILED =>
@@ -993,7 +993,7 @@ class LifecycleManager(val appUniqueId: String, val conf:
CelebornConf) extends
latestPartitionLocation.remove(shuffleId)
commitManager.removeExpiredShuffle(shuffleId)
changePartitionManager.removeExpiredShuffle(shuffleId)
- val unregisterShuffleResponse = requestPrimaryUnregisterShuffle(
+ val unregisterShuffleResponse = requestMasterUnregisterShuffle(
UnregisterShuffle(appUniqueId, shuffleId,
MasterClient.genRequestId()))
// if unregister shuffle not success, wait next turn
if (StatusCode.SUCCESS ==
Utils.toStatusCode(unregisterShuffleResponse.getStatus)) {
@@ -1003,7 +1003,7 @@ class LifecycleManager(val appUniqueId: String, val conf:
CelebornConf) extends
}
}
- private def requestPrimaryRequestSlotsWithRetry(
+ private def requestMasterRequestSlotsWithRetry(
shuffleId: Int,
ids: util.ArrayList[Integer]): RequestSlotsResponse = {
val req =
@@ -1015,15 +1015,15 @@ class LifecycleManager(val appUniqueId: String, val
conf: CelebornConf) extends
pushReplicateEnabled,
pushRackAwareEnabled,
userIdentifier)
- val res = requestPrimaryRequestSlots(req)
+ val res = requestMasterRequestSlots(req)
if (res.status != StatusCode.SUCCESS) {
- requestPrimaryRequestSlots(req)
+ requestMasterRequestSlots(req)
} else {
res
}
}
- private def requestPrimaryRequestSlots(message: RequestSlots):
RequestSlotsResponse = {
+ private def requestMasterRequestSlots(message: RequestSlots):
RequestSlotsResponse = {
val shuffleKey = Utils.makeShuffleKey(message.applicationId,
message.shuffleId)
try {
masterClient.askSync[RequestSlotsResponse](message,
classOf[RequestSlotsResponse])
@@ -1064,7 +1064,7 @@ class LifecycleManager(val appUniqueId: String, val conf:
CelebornConf) extends
}
}
- private def requestPrimaryUnregisterShuffle(message: PbUnregisterShuffle)
+ private def requestMasterUnregisterShuffle(message: PbUnregisterShuffle)
: PbUnregisterShuffleResponse = {
try {
masterClient.askSync[PbUnregisterShuffleResponse](
