You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ozone.apache.org by sz...@apache.org on 2021/07/28 23:31:00 UTC

[ozone] 03/06: Revert "[HDDS-5452] Add link method to ContainerStateMachine for Ratis streaming (#2422)" (#2427)

This is an automated email from the ASF dual-hosted git repository.

szetszwo pushed a commit to branch HDDS-4454
in repository https://gitbox.apache.org/repos/asf/ozone.git

commit bfd54f1e9805052cdbd14fd8997e713e266f3985
Author: Tsz-Wo Nicholas Sze <sz...@apache.org>
AuthorDate: Sun Jul 18 12:19:21 2021 +0800

    Revert "[HDDS-5452] Add link method to ContainerStateMachine for Ratis streaming (#2422)" (#2427)
    
    This reverts commit af10e0e643ff3753535843c2bc47b9ea44548764.
---
 .../transport/server/ratis/ContainerStateMachine.java   | 17 -----------------
 1 file changed, 17 deletions(-)

diff --git a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/transport/server/ratis/ContainerStateMachine.java b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/transport/server/ratis/ContainerStateMachine.java
index 86cc252..092dad4 100644
--- a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/transport/server/ratis/ContainerStateMachine.java
+++ b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/transport/server/ratis/ContainerStateMachine.java
@@ -89,7 +89,6 @@ import org.apache.ratis.thirdparty.com.google.protobuf.InvalidProtocolBufferExce
 import org.apache.ratis.thirdparty.com.google.protobuf.TextFormat;
 import org.apache.ratis.util.TaskQueue;
 import org.apache.ratis.util.function.CheckedSupplier;
-import org.apache.ratis.util.JavaUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -520,22 +519,6 @@ public class ContainerStateMachine extends BaseStateMachine {
     }, executor);
   }
 
-  public CompletableFuture<?> link(DataStream stream, LogEntryProto entry) {
-    return CompletableFuture.supplyAsync(() -> {
-      if (stream == null) {
-        return JavaUtils.completeExceptionally(
-            new IllegalStateException("DataStream is null"));
-      }
-      if (stream.getDataChannel().isOpen()) {
-        return JavaUtils.completeExceptionally(
-            new IllegalStateException(
-                "DataStream: " + stream + " is not closed properly"));
-      } else {
-        return CompletableFuture.completedFuture(null);
-      }
-    }, executor);
-  }
-
   private ExecutorService getChunkExecutor(WriteChunkRequestProto req) {
     int hash = Objects.hashCode(req.getBlockID());
     if (hash == Integer.MIN_VALUE) {

---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@ozone.apache.org
For additional commands, e-mail: commits-help@ozone.apache.org