You are viewing a plain text version of this content. The canonical link for it is here.
Posted to issues@celeborn.apache.org by "waitinfuture (via GitHub)" <gi...@apache.org> on 2023/02/06 13:14:33 UTC
[GitHub] [incubator-celeborn] waitinfuture commented on a diff in pull request #1066: [CELEBORN-207] Support network bakpressure and control
waitinfuture commented on code in PR #1066:
URL: https://github.com/apache/incubator-celeborn/pull/1066#discussion_r1097313110
##########
worker/src/main/java/org/apache/celeborn/service/deploy/worker/congestcontrol/TimeSlidingHub.java:
##########
@@ -0,0 +1,151 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.celeborn.service.deploy.worker.congestcontrol;
+
+import java.util.Iterator;
+import java.util.concurrent.LinkedBlockingDeque;
+
+import com.google.common.annotations.VisibleForTesting;
+import org.apache.commons.lang3.tuple.Pair;
+
+/**
+ * A time sliding list that group different {@link TimeSlidingNode} with corresponding timestamp by
+ * exact interval 1 second. Internally hold a {@link sumNode} to get the sum of the nodes in the
+ * list.
+ *
+ * <p>This list is thread-safe, but {@link TimeSlidingNode} returned by the method {@link sum}
+ * should only be readable, do not try to update it.
+ */
+public abstract class TimeSlidingHub<N extends TimeSlidingHub.TimeSlidingNode> {
+
+ /**
+ * This class internally used by {@link TimeSlidingHub} to identify each node value.
+ *
+ * <p>The implementation should make all methods thread-safe as it could be accessed by different
+ * threads.
+ */
+ public interface TimeSlidingNode extends Cloneable {
+
+ /** Merge new node with this. */
+ void combineNode(TimeSlidingNode node);
+
+ /** Minus the value from the {@param node}. */
+ void separateNode(TimeSlidingNode node);
+
+ TimeSlidingNode clone();
+ }
+
+ // 1 second.
+ private final int intervalPerBucketInMills = 1000;
+ private final int maxQueueSize;
+ private N sumNode;
+
+ private final LinkedBlockingDeque<Pair<Long, N>> _deque;
+
+ public TimeSlidingHub(int timeWindowsInSecs) {
+ this._deque = new LinkedBlockingDeque<>();
+ this.maxQueueSize = timeWindowsInSecs * 1000 / intervalPerBucketInMills;
+ this.sumNode = newEmptyNode();
+ }
+
+ public N sum() {
+ return sumNode;
+ }
+
+ public void add(N newNode) {
+ long currentTimestamp = currentTimeMillis();
+ add(currentTimestamp, newNode);
+ }
+
+ public synchronized void add(long currentTimestamp, N newNode) {
+ if (_deque.size() == 0) {
+ _deque.add(Pair.of(currentTimestamp, (N) newNode.clone()));
+ sumNode = (N) newNode.clone();
+ return;
+ }
+
+ Pair<Long, N> lastNode = _deque.getLast();
+
+ long timeDiff = currentTimestamp - lastNode.getLeft();
+
+ if (timeDiff >= intervalPerBucketInMills) {
+ // The node doesn't belong to the lastNode, there might be 2 different scenarios
+ // 1. All existing nodes are out of date, should be removed
+ // 2. some nodes are out of date, should be removed
+ long nodesToAdd = timeDiff / intervalPerBucketInMills;
+ if (nodesToAdd >= maxQueueSize) {
+ // The new node exceed existing sliding list, need to clear all old nodes
+ // and create a new sliding list
+ _deque.clear();
+ _deque.add(Pair.of(currentTimestamp, (N) newNode.clone()));
+ sumNode = (N) newNode.clone();
+ return;
+ }
+
+ // Add new node at the end of the list, and deprecate nodes out of timeInterval
+ for (long i = 1; i < nodesToAdd; i++) {
+ N toAdd = newEmptyNode();
+ lastNode = Pair.of(lastNode.getLeft() + intervalPerBucketInMills, toAdd);
+ _deque.add(lastNode);
+ }
+
+ _deque.add(Pair.of(lastNode.getLeft() + intervalPerBucketInMills, (N) newNode.clone()));
Review Comment:
should be ```intervalPerBucketInMills * nodesToAdd``` ?
##########
worker/src/main/java/org/apache/celeborn/service/deploy/worker/congestcontrol/TimeSlidingHub.java:
##########
@@ -0,0 +1,151 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.celeborn.service.deploy.worker.congestcontrol;
+
+import java.util.Iterator;
+import java.util.concurrent.LinkedBlockingDeque;
+
+import com.google.common.annotations.VisibleForTesting;
+import org.apache.commons.lang3.tuple.Pair;
+
+/**
+ * A time sliding list that group different {@link TimeSlidingNode} with corresponding timestamp by
+ * exact interval 1 second. Internally hold a {@link sumNode} to get the sum of the nodes in the
+ * list.
+ *
+ * <p>This list is thread-safe, but {@link TimeSlidingNode} returned by the method {@link sum}
+ * should only be readable, do not try to update it.
+ */
+public abstract class TimeSlidingHub<N extends TimeSlidingHub.TimeSlidingNode> {
+
+ /**
+ * This class internally used by {@link TimeSlidingHub} to identify each node value.
+ *
+ * <p>The implementation should make all methods thread-safe as it could be accessed by different
+ * threads.
+ */
+ public interface TimeSlidingNode extends Cloneable {
+
+ /** Merge new node with this. */
+ void combineNode(TimeSlidingNode node);
+
+ /** Minus the value from the {@param node}. */
+ void separateNode(TimeSlidingNode node);
+
+ TimeSlidingNode clone();
+ }
+
+ // 1 second.
+ private final int intervalPerBucketInMills = 1000;
+ private final int maxQueueSize;
+ private N sumNode;
+
+ private final LinkedBlockingDeque<Pair<Long, N>> _deque;
+
+ public TimeSlidingHub(int timeWindowsInSecs) {
+ this._deque = new LinkedBlockingDeque<>();
+ this.maxQueueSize = timeWindowsInSecs * 1000 / intervalPerBucketInMills;
+ this.sumNode = newEmptyNode();
+ }
+
+ public N sum() {
+ return sumNode;
+ }
+
+ public void add(N newNode) {
+ long currentTimestamp = currentTimeMillis();
+ add(currentTimestamp, newNode);
+ }
+
+ public synchronized void add(long currentTimestamp, N newNode) {
+ if (_deque.size() == 0) {
+ _deque.add(Pair.of(currentTimestamp, (N) newNode.clone()));
+ sumNode = (N) newNode.clone();
+ return;
+ }
+
+ Pair<Long, N> lastNode = _deque.getLast();
+
+ long timeDiff = currentTimestamp - lastNode.getLeft();
+
+ if (timeDiff >= intervalPerBucketInMills) {
+ // The node doesn't belong to the lastNode, there might be 2 different scenarios
+ // 1. All existing nodes are out of date, should be removed
+ // 2. some nodes are out of date, should be removed
+ long nodesToAdd = timeDiff / intervalPerBucketInMills;
+ if (nodesToAdd >= maxQueueSize) {
+ // The new node exceed existing sliding list, need to clear all old nodes
+ // and create a new sliding list
+ _deque.clear();
+ _deque.add(Pair.of(currentTimestamp, (N) newNode.clone()));
+ sumNode = (N) newNode.clone();
+ return;
+ }
+
+ // Add new node at the end of the list, and deprecate nodes out of timeInterval
+ for (long i = 1; i < nodesToAdd; i++) {
+ N toAdd = newEmptyNode();
+ lastNode = Pair.of(lastNode.getLeft() + intervalPerBucketInMills, toAdd);
Review Comment:
should be ```intervalPerBucketInMills * i``` ?
##########
worker/src/main/java/org/apache/celeborn/service/deploy/worker/congestcontrol/CongestionController.java:
##########
@@ -0,0 +1,253 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.celeborn.service.deploy.worker.congestcontrol;
+
+import java.util.Iterator;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import org.apache.celeborn.common.identity.UserIdentifier;
+import org.apache.celeborn.common.network.server.memory.MemoryManager;
+
+public class CongestionController {
+
+ private static final Logger logger = LoggerFactory.getLogger(CongestionController.class);
+ private static volatile CongestionController _INSTANCE = null;
+
+ private final int sampleTimeWindowSeconds;
+ private final long highWatermark;
+ private final long lowWatermark;
+ private final long userInactiveTimeMills;
+
+ private final AtomicBoolean overHighWatermark = new AtomicBoolean(false);
+
+ private final BufferStatusHub consumedBufferStatusHub;
+
+ private final ConcurrentHashMap<UserIdentifier, UserBufferInfo> userBufferStatuses;
+
+ private final ScheduledExecutorService removeUserExecutorService;
+
+ protected CongestionController(
+ int sampleTimeWindowSeconds,
+ long highWatermark,
+ long lowWatermark,
+ long userInactiveTimeMills) {
+ assert (highWatermark > lowWatermark);
+
+ this.sampleTimeWindowSeconds = sampleTimeWindowSeconds;
+ this.highWatermark = highWatermark;
+ this.lowWatermark = lowWatermark;
+ this.userInactiveTimeMills = userInactiveTimeMills;
+ this.consumedBufferStatusHub = new BufferStatusHub(sampleTimeWindowSeconds);
+ this.userBufferStatuses = new ConcurrentHashMap<>();
+
+ this.removeUserExecutorService =
+ Executors.newSingleThreadScheduledExecutor(
Review Comment:
use ```ThreadUtils.newDaemonSingleThreadScheduledExecutor```
##########
worker/src/main/java/org/apache/celeborn/service/deploy/worker/congestcontrol/BufferStatusHub.java:
##########
@@ -0,0 +1,71 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.celeborn.service.deploy.worker.congestcontrol;
+
+import java.util.concurrent.atomic.AtomicLong;
+
+public class BufferStatusHub extends TimeSlidingHub<BufferStatusHub.BufferStatusNode> {
+
+ public static class BufferStatusNode implements TimeSlidingHub.TimeSlidingNode {
+
+ private final AtomicLong numBytes;
Review Comment:
IMO LongAdder is better
##########
worker/src/main/scala/org/apache/celeborn/service/deploy/worker/PushDataHandler.scala:
##########
@@ -334,7 +335,23 @@ class PushDataHandler extends BaseMessageHandler with Logging {
}
})
} else {
- wrappedCallback.onSuccess(ByteBuffer.wrap(Array[Byte]()))
+ Option(CongestionController.instance()) match {
+ case Some(rateLimitController) =>
+ if (rateLimitController.isUserCongested(fileWriter.getFileInfo.getUserIdentifier)) {
+ if (isMaster) {
+ wrappedCallback.onSuccess(
+ ByteBuffer.wrap(
+ Array[Byte](StatusCode.PUSH_DATA_SUCCESS_MASTER_CONGESTED.getValue)))
+ } else {
+ wrappedCallback.onSuccess(
Review Comment:
ditto
##########
worker/src/main/scala/org/apache/celeborn/service/deploy/worker/PushDataHandler.scala:
##########
@@ -334,7 +335,23 @@ class PushDataHandler extends BaseMessageHandler with Logging {
}
})
} else {
- wrappedCallback.onSuccess(ByteBuffer.wrap(Array[Byte]()))
+ Option(CongestionController.instance()) match {
+ case Some(rateLimitController) =>
+ if (rateLimitController.isUserCongested(fileWriter.getFileInfo.getUserIdentifier)) {
+ if (isMaster) {
+ wrappedCallback.onSuccess(
+ ByteBuffer.wrap(
+ Array[Byte](StatusCode.PUSH_DATA_SUCCESS_MASTER_CONGESTED.getValue)))
+ } else {
+ wrappedCallback.onSuccess(
+ ByteBuffer.wrap(Array[Byte](StatusCode.PUSH_DATA_SUCCESS_SLAVE_CONGESTED.getValue)))
+ }
+ } else {
+ wrappedCallback.onSuccess(ByteBuffer.wrap(Array[Byte]()))
Review Comment:
ditto
##########
worker/src/main/scala/org/apache/celeborn/service/deploy/worker/PushDataHandler.scala:
##########
@@ -334,7 +335,23 @@ class PushDataHandler extends BaseMessageHandler with Logging {
}
})
} else {
- wrappedCallback.onSuccess(ByteBuffer.wrap(Array[Byte]()))
+ Option(CongestionController.instance()) match {
+ case Some(rateLimitController) =>
+ if (rateLimitController.isUserCongested(fileWriter.getFileInfo.getUserIdentifier)) {
+ if (isMaster) {
+ wrappedCallback.onSuccess(
+ ByteBuffer.wrap(
+ Array[Byte](StatusCode.PUSH_DATA_SUCCESS_MASTER_CONGESTED.getValue)))
+ } else {
+ wrappedCallback.onSuccess(
+ ByteBuffer.wrap(Array[Byte](StatusCode.PUSH_DATA_SUCCESS_SLAVE_CONGESTED.getValue)))
+ }
+ } else {
+ wrappedCallback.onSuccess(ByteBuffer.wrap(Array[Byte]()))
+ }
+ case None =>
+ wrappedCallback.onSuccess(ByteBuffer.wrap(Array[Byte]()))
Review Comment:
ditto
##########
worker/src/main/scala/org/apache/celeborn/service/deploy/worker/PushDataHandler.scala:
##########
@@ -552,7 +569,23 @@ class PushDataHandler extends BaseMessageHandler with Logging {
}
})
} else {
- wrappedCallback.onSuccess(ByteBuffer.wrap(Array[Byte]()))
+ Option(CongestionController.instance()) match {
+ case Some(rateLimitController) if fileWriters.nonEmpty =>
+ if (rateLimitController.isUserCongested(fileWriters.head.getFileInfo.getUserIdentifier)) {
+ if (isMaster) {
+ wrappedCallback.onSuccess(
+ ByteBuffer.wrap(
+ Array[Byte](StatusCode.PUSH_DATA_SUCCESS_MASTER_CONGESTED.getValue)))
+ } else {
+ wrappedCallback.onSuccess(
+ ByteBuffer.wrap(Array[Byte](StatusCode.PUSH_DATA_SUCCESS_SLAVE_CONGESTED.getValue)))
+ }
+ } else {
+ wrappedCallback.onSuccess(ByteBuffer.wrap(Array[Byte]()))
+ }
+ case None =>
+ wrappedCallback.onSuccess(ByteBuffer.wrap(Array[Byte]()))
Review Comment:
ditto
##########
worker/src/main/java/org/apache/celeborn/service/deploy/worker/congestcontrol/CongestionController.java:
##########
@@ -0,0 +1,253 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.celeborn.service.deploy.worker.congestcontrol;
+
+import java.util.Iterator;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import org.apache.celeborn.common.identity.UserIdentifier;
+import org.apache.celeborn.common.network.server.memory.MemoryManager;
+
+public class CongestionController {
+
+ private static final Logger logger = LoggerFactory.getLogger(CongestionController.class);
+ private static volatile CongestionController _INSTANCE = null;
+
+ private final int sampleTimeWindowSeconds;
+ private final long highWatermark;
+ private final long lowWatermark;
+ private final long userInactiveTimeMills;
+
+ private final AtomicBoolean overHighWatermark = new AtomicBoolean(false);
+
+ private final BufferStatusHub consumedBufferStatusHub;
+
+ private final ConcurrentHashMap<UserIdentifier, UserBufferInfo> userBufferStatuses;
+
+ private final ScheduledExecutorService removeUserExecutorService;
+
+ protected CongestionController(
+ int sampleTimeWindowSeconds,
+ long highWatermark,
+ long lowWatermark,
+ long userInactiveTimeMills) {
+ assert (highWatermark > lowWatermark);
+
+ this.sampleTimeWindowSeconds = sampleTimeWindowSeconds;
+ this.highWatermark = highWatermark;
+ this.lowWatermark = lowWatermark;
+ this.userInactiveTimeMills = userInactiveTimeMills;
+ this.consumedBufferStatusHub = new BufferStatusHub(sampleTimeWindowSeconds);
+ this.userBufferStatuses = new ConcurrentHashMap<>();
+
+ this.removeUserExecutorService =
+ Executors.newSingleThreadScheduledExecutor(
+ r -> {
+ Thread thread = new Thread(r, "remove-inactive-user");
+ thread.setDaemon(true);
+ return thread;
+ });
+
+ this.removeUserExecutorService.scheduleWithFixedDelay(
+ this::removeInactiveUsers, 0, userInactiveTimeMills, TimeUnit.SECONDS);
+ }
+
+ public static synchronized CongestionController initialize(
+ int sampleTimeWindowSeconds,
+ long highWatermark,
+ long lowWatermark,
+ long userInactiveTimeMills) {
+ if (_INSTANCE == null) {
Review Comment:
I think it's unnecessary to check null here
##########
worker/src/main/scala/org/apache/celeborn/service/deploy/worker/PushDataHandler.scala:
##########
@@ -334,7 +335,23 @@ class PushDataHandler extends BaseMessageHandler with Logging {
}
})
} else {
- wrappedCallback.onSuccess(ByteBuffer.wrap(Array[Byte]()))
+ Option(CongestionController.instance()) match {
+ case Some(rateLimitController) =>
+ if (rateLimitController.isUserCongested(fileWriter.getFileInfo.getUserIdentifier)) {
+ if (isMaster) {
+ wrappedCallback.onSuccess(
Review Comment:
should use callback instead of wrappedCallback here, cc @AngersZhuuuu
##########
worker/src/main/scala/org/apache/celeborn/service/deploy/worker/PushDataHandler.scala:
##########
@@ -552,7 +569,23 @@ class PushDataHandler extends BaseMessageHandler with Logging {
}
})
} else {
- wrappedCallback.onSuccess(ByteBuffer.wrap(Array[Byte]()))
+ Option(CongestionController.instance()) match {
+ case Some(rateLimitController) if fileWriters.nonEmpty =>
+ if (rateLimitController.isUserCongested(fileWriters.head.getFileInfo.getUserIdentifier)) {
+ if (isMaster) {
+ wrappedCallback.onSuccess(
Review Comment:
ditto
##########
worker/src/main/scala/org/apache/celeborn/service/deploy/worker/PushDataHandler.scala:
##########
@@ -552,7 +569,23 @@ class PushDataHandler extends BaseMessageHandler with Logging {
}
})
} else {
- wrappedCallback.onSuccess(ByteBuffer.wrap(Array[Byte]()))
+ Option(CongestionController.instance()) match {
+ case Some(rateLimitController) if fileWriters.nonEmpty =>
+ if (rateLimitController.isUserCongested(fileWriters.head.getFileInfo.getUserIdentifier)) {
+ if (isMaster) {
+ wrappedCallback.onSuccess(
+ ByteBuffer.wrap(
+ Array[Byte](StatusCode.PUSH_DATA_SUCCESS_MASTER_CONGESTED.getValue)))
+ } else {
+ wrappedCallback.onSuccess(
Review Comment:
ditto
##########
worker/src/main/scala/org/apache/celeborn/service/deploy/worker/PushDataHandler.scala:
##########
@@ -552,7 +569,23 @@ class PushDataHandler extends BaseMessageHandler with Logging {
}
})
} else {
- wrappedCallback.onSuccess(ByteBuffer.wrap(Array[Byte]()))
+ Option(CongestionController.instance()) match {
+ case Some(rateLimitController) if fileWriters.nonEmpty =>
+ if (rateLimitController.isUserCongested(fileWriters.head.getFileInfo.getUserIdentifier)) {
+ if (isMaster) {
+ wrappedCallback.onSuccess(
+ ByteBuffer.wrap(
+ Array[Byte](StatusCode.PUSH_DATA_SUCCESS_MASTER_CONGESTED.getValue)))
+ } else {
+ wrappedCallback.onSuccess(
+ ByteBuffer.wrap(Array[Byte](StatusCode.PUSH_DATA_SUCCESS_SLAVE_CONGESTED.getValue)))
+ }
+ } else {
+ wrappedCallback.onSuccess(ByteBuffer.wrap(Array[Byte]()))
Review Comment:
ditto
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@celeborn.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org