Revert "Add connection preface process to TripleHttp2Protocol (#15368)" (#15435)

This reverts commit e396bde.

Author: zrlw

dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/api/WireProtocol.java

@@ -32,8 +32,4 @@ public interface WireProtocol {
     void configClientPipeline(URL url, ChannelOperator operator, ContextOperator contextOperator);
 
     void close();
-
-    default boolean hasConnectionPreface() {
-        return false;
-    }
 }

dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/api/connection/ConnectionHandler.java

@@ -31,11 +31,4 @@ public interface ConnectionHandler {
      * @param channel Channel
      */
     void reconnect(Object channel);
-
-    /**
-     * when connection preface is received.
-     *
-     * @param channel Channel
-     */
-    void onConnectionPrefaceReceived(Object channel);
 }

dubbo-remoting/dubbo-remoting-netty4/src/main/java/org/apache/dubbo/remoting/transport/netty4/AbstractNettyConnectionClient.java

@@ -57,8 +57,6 @@ public abstract class AbstractNettyConnectionClient extends AbstractConnectionCl
 
     private ConnectionListener connectionListener;
 
-    private AtomicReference<Promise<Void>> connectionPrefaceReceivedPromiseRef;
-
     public static final AttributeKey<AbstractConnectionClient> CONNECTION = AttributeKey.valueOf("connection");
 
     public AbstractNettyConnectionClient(URL url, ChannelHandler handler) throws RemotingException {
@@ -83,12 +81,6 @@ protected void initConnectionClient() {
         isReconnecting = new AtomicBoolean(false);
         connectionListener = new ConnectionListener();
         increase();
-
-        // Create connection preface received promise for Http2 client since it should wait server http2 settings frame
-        // before sending client Headers frame, see details at https://github.com/apache/dubbo/issues/15233
-        if (protocol != null && protocol.hasConnectionPreface()) {
-            connectionPrefaceReceivedPromiseRef = new AtomicReference<>();
-        }
     }
 
     protected abstract void initBootstrap() throws Exception;
@@ -137,11 +129,6 @@ protected void doConnect() throws RemotingException {
         Future<Void> connectPromise = performConnect();
         connectPromise.addListener(connectionListener);
 
-        Promise<Void> connectionPrefaceReceivedPromise = null;
-        if (connectionPrefaceReceivedPromiseRef != null) {
-            connectionPrefaceReceivedPromise = getOrCreateConnectionPrefaceReceivedPromise();
-        }
-
         boolean ret = connectingPromise.awaitUninterruptibly(getConnectTimeout(), TimeUnit.MILLISECONDS);
         // destroy connectingPromise after used
         synchronized (this) {
@@ -181,35 +168,6 @@ protected void doConnect() throws RemotingException {
 
             throw remotingException;
         }
-
-        if (connectionPrefaceReceivedPromise != null) {
-            long retainedTimeout = getConnectTimeout() - System.currentTimeMillis() + start;
-            ret = connectionPrefaceReceivedPromise.awaitUninterruptibly(retainedTimeout, TimeUnit.MILLISECONDS);
-            // destroy connectionPrefaceReceivedPromise after used
-            synchronized (this) {
-                connectionPrefaceReceivedPromiseRef.set(null);
-            }
-            if (!ret || !connectionPrefaceReceivedPromise.isSuccess()) {
-                // 6-2 Client-side connection preface timeout
-                RemotingException remotingException = new RemotingException(
-                        this,
-                        "client(url: " + getUrl() + ") failed to connect to server " + getConnectAddress()
-                                + " client-side connection preface timeout " + getConnectTimeout() + "ms (elapsed: "
-                                + (System.currentTimeMillis() - start) + "ms) from netty client "
-                                + NetUtils.getLocalHost()
-                                + " using dubbo version "
-                                + Version.getVersion());
-
-                logger.error(
-                        TRANSPORT_CLIENT_CONNECT_TIMEOUT,
-                        "provider crash",
-                        "",
-                        "Client-side connection preface timeout",
-                        remotingException);
-
-                throw remotingException;
-            }
-        }
     }
 
     protected abstract ChannelFuture performConnect();
@@ -288,16 +246,6 @@ public void onGoaway(Object channel) {
         }
     }
 
-    public void onConnectionPrefaceReceived(Object channel) {
-        if (!(channel instanceof io.netty.channel.Channel) || connectionPrefaceReceivedPromiseRef == null) {
-            return;
-        }
-        Promise<Void> connectionPrefaceReceivedPromise = connectionPrefaceReceivedPromiseRef.get();
-        if (connectionPrefaceReceivedPromise != null) {
-            connectionPrefaceReceivedPromise.trySuccess(null);
-        }
-    }
-
     @Override
     protected Channel getChannel() {
         io.netty.channel.Channel c = getNettyChannel();
@@ -354,11 +302,6 @@ private Promise<Object> getOrCreateConnectingPromise() {
         return connectingPromiseRef.get();
     }
 
-    private Promise<Void> getOrCreateConnectionPrefaceReceivedPromise() {
-        connectionPrefaceReceivedPromiseRef.compareAndSet(null, new DefaultPromise<>(GlobalEventExecutor.INSTANCE));
-        return connectionPrefaceReceivedPromiseRef.get();
-    }
-
     public Promise<Void> getClosePromise() {
         return closePromise;
     }

dubbo-remoting/dubbo-remoting-netty4/src/main/java/org/apache/dubbo/remoting/transport/netty4/NettyConnectionHandler.java

@@ -83,14 +83,6 @@ public void reconnect(Object channel) {
         eventLoop.schedule(connectionClient::doReconnect, 1, TimeUnit.SECONDS);
     }
 
-    @Override
-    public void onConnectionPrefaceReceived(Object channel) {
-        if (!(channel instanceof Channel)) {
-            return;
-        }
-        connectionClient.onConnectionPrefaceReceived(channel);
-    }
-
     @Override
     public void channelActive(ChannelHandlerContext ctx) {
         ctx.fireChannelActive();

dubbo-rpc/dubbo-rpc-triple/src/main/java/org/apache/dubbo/rpc/protocol/tri/TripleHttp2Protocol.java

@@ -41,7 +41,6 @@
 import org.apache.dubbo.rpc.protocol.tri.h12.http1.DefaultHttp11ServerTransportListenerFactory;
 import org.apache.dubbo.rpc.protocol.tri.h12.http2.GenericHttp2ServerTransportListenerFactory;
 import org.apache.dubbo.rpc.protocol.tri.transport.TripleGoAwayHandler;
-import org.apache.dubbo.rpc.protocol.tri.transport.TripleHttp2SettingsHandler;
 import org.apache.dubbo.rpc.protocol.tri.transport.TripleServerConnectionHandler;
 import org.apache.dubbo.rpc.protocol.tri.transport.TripleTailHandler;
 import org.apache.dubbo.rpc.protocol.tri.websocket.DefaultWebSocketServerTransportListenerFactory;
@@ -96,11 +95,6 @@ public void close() {
         super.close();
     }
 
-    @Override
-    public boolean hasConnectionPreface() {
-        return true;
-    }
-
     @Override
     public void configClientPipeline(URL url, ChannelOperator operator, ContextOperator contextOperator) {
         TripleConfig tripleConfig = ConfigManager.getProtocolOrDefault(url).getTripleOrDefault();
@@ -122,7 +116,6 @@ public void configClientPipeline(URL url, ChannelOperator operator, ContextOpera
         handlers.add(new ChannelHandlerPretender(new Http2MultiplexHandler(new ChannelDuplexHandler())));
         handlers.add(new ChannelHandlerPretender(new TriplePingPongHandler(UrlUtils.getCloseTimeout(url))));
         handlers.add(new ChannelHandlerPretender(new TripleGoAwayHandler()));
-        handlers.add(new ChannelHandlerPretender(new TripleHttp2SettingsHandler()));
         handlers.add(new ChannelHandlerPretender(new TripleTailHandler()));
         operator.configChannelHandler(handlers);
     }