This is an automated email from the ASF dual-hosted git repository.
ethanfeng pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/celeborn.git
The following commit(s) were added to refs/heads/main by this push:
new 9d4b4cc7b [CELEBORN-1656] Remove duplicate UserProduceSpeed metrics
9d4b4cc7b is described below
commit 9d4b4cc7b1c0db3c6026ebfaa3c927945ddfe5ec
Author: Xianming Lei <[email protected]>
AuthorDate: Wed Oct 16 17:45:55 2024 +0800
[CELEBORN-1656] Remove duplicate UserProduceSpeed metrics
### What changes were proposed in this pull request?
Remove duplicate UserProduceSpeed metrics
### Why are the changes needed?
UserProduceSpeed metrics have been added in UserCongestionControlContext
### Does this PR introduce _any_ user-facing change?
No.
### How was this patch tested?
Existing UTs.
Closes #2816 from leixm/CELEBORN-1656.
Authored-by: Xianming Lei <[email protected]>
Signed-off-by: mingji <[email protected]>
---
.../service/deploy/worker/congestcontrol/CongestionController.java | 4 ----
.../deploy/worker/congestcontrol/UserCongestionControlContext.java | 4 +---
2 files changed, 1 insertion(+), 7 deletions(-)
diff --git
a/worker/src/main/java/org/apache/celeborn/service/deploy/worker/congestcontrol/CongestionController.java
b/worker/src/main/java/org/apache/celeborn/service/deploy/worker/congestcontrol/CongestionController.java
index b0c3a2ca1..04491e58c 100644
---
a/worker/src/main/java/org/apache/celeborn/service/deploy/worker/congestcontrol/CongestionController.java
+++
b/worker/src/main/java/org/apache/celeborn/service/deploy/worker/congestcontrol/CongestionController.java
@@ -196,10 +196,6 @@ public class CongestionController {
logger.info("New user {} comes, initializing its rate status", user);
BufferStatusHub bufferStatusHub = new
BufferStatusHub(sampleTimeWindowSeconds);
UserBufferInfo userInfo = new
UserBufferInfo(System.currentTimeMillis(), bufferStatusHub);
- workerSource.addGauge(
- WorkerSource.USER_PRODUCE_SPEED(),
- userIdentifier.toJMap(),
- () -> getUserProduceSpeed(userInfo));
return userInfo;
});
}
diff --git
a/worker/src/main/java/org/apache/celeborn/service/deploy/worker/congestcontrol/UserCongestionControlContext.java
b/worker/src/main/java/org/apache/celeborn/service/deploy/worker/congestcontrol/UserCongestionControlContext.java
index 4d51139ca..fec5da7d6 100644
---
a/worker/src/main/java/org/apache/celeborn/service/deploy/worker/congestcontrol/UserCongestionControlContext.java
+++
b/worker/src/main/java/org/apache/celeborn/service/deploy/worker/congestcontrol/UserCongestionControlContext.java
@@ -17,8 +17,6 @@
package org.apache.celeborn.service.deploy.worker.congestcontrol;
-import com.codahale.metrics.Gauge;
-
import org.apache.celeborn.common.identity.UserIdentifier;
import org.apache.celeborn.common.metrics.source.AbstractSource;
import org.apache.celeborn.service.deploy.worker.WorkerSource;
@@ -45,7 +43,7 @@ public class UserCongestionControlContext {
workerSource.addGauge(
WorkerSource.USER_PRODUCE_SPEED(),
userIdentifier.toJMap(),
- (Gauge<Long>) () ->
userBufferInfo.getBufferStatusHub().avgBytesPerSec());
+ () -> userBufferInfo.getBufferStatusHub().avgBytesPerSec());
}
public void onCongestionControl() {