Skip to content

Commit a502e9d

Browse files
committed
modify based on cr
1 parent e07c19e commit a502e9d

File tree

5 files changed

+24
-38
lines changed

5 files changed

+24
-38
lines changed

LICENSE

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -311,6 +311,7 @@ Apache Kafka
311311
./fluss-common/src/main/java/com/alibaba/fluss/utils/crc/PureJavaCrc32C.java
312312
./fluss-common/src/main/java/com/alibaba/fluss/utils/log/ByteBufferUnmapper.java
313313
./fluss-common/src/main/java/com/alibaba/fluss/utils/log/FairBucketStatusMap.java
314+
./fluss-common/src/main/java/com/alibaba/fluss/utils/ExponentialBackoff.java
314315
./fluss-server/src/main/java/com/alibaba/fluss/server/coordinator/statemachine/ReplicaStateMachine.java
315316
./fluss-server/src/main/java/com/alibaba/fluss/server/coordinator/statemachine/TableBucketStateMachine.java
316317
./fluss-server/src/main/java/com/alibaba/fluss/server/log/AbstractIndex.java

fluss-common/src/main/java/com/alibaba/fluss/security/auth/ClientAuthenticator.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818

1919
import com.alibaba.fluss.annotation.PublicEvolving;
2020
import com.alibaba.fluss.exception.AuthenticationException;
21-
import com.alibaba.fluss.shaded.netty4.io.netty.channel.Channel;
2221

2322
import javax.annotation.Nullable;
2423

@@ -81,7 +80,5 @@ default void initialize(AuthenticateContext context) {}
8180
boolean isCompleted();
8281

8382
/** The context of the authentication process. */
84-
interface AuthenticateContext {
85-
Channel channel();
86-
}
83+
interface AuthenticateContext {}
8784
}

fluss-common/src/main/java/com/alibaba/fluss/security/auth/ServerAuthenticator.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
import com.alibaba.fluss.annotation.PublicEvolving;
2020
import com.alibaba.fluss.exception.AuthenticationException;
2121
import com.alibaba.fluss.security.acl.FlussPrincipal;
22-
import com.alibaba.fluss.shaded.netty4.io.netty.channel.Channel;
2322

2423
/**
2524
* Authenticator for server side.
@@ -85,7 +84,5 @@ default void initialize(AuthenticateContext context) {}
8584
FlussPrincipal createPrincipal();
8685

8786
/** The context of the authentication process. */
88-
interface AuthenticateContext {
89-
Channel channel();
90-
}
87+
interface AuthenticateContext {}
9188
}

fluss-rpc/src/main/java/com/alibaba/fluss/rpc/netty/client/ServerConnection.java

Lines changed: 19 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -416,25 +416,25 @@ private void sendAuthenticateRequest(byte[] challenge) {
416416
}
417417

418418
private void handleAuthenticateResponse(ApiMessage response, Throwable cause) {
419-
if (cause != null) {
420-
if (cause instanceof RetriableAuthenticationException) {
421-
LOG.warn("Authentication failed, retrying {} times", retryAuthCount, cause);
422-
channel.eventLoop()
423-
.schedule(
424-
this::sendInitialToken,
425-
backoff.backoff(retryAuthCount++),
426-
TimeUnit.MILLISECONDS);
427-
} else {
428-
close(cause);
419+
synchronized (lock) {
420+
if (cause != null) {
421+
if (cause instanceof RetriableAuthenticationException) {
422+
LOG.warn("Authentication failed, retrying {} times", retryAuthCount, cause);
423+
channel.eventLoop()
424+
.schedule(
425+
this::sendInitialToken,
426+
backoff.backoff(retryAuthCount++),
427+
TimeUnit.MILLISECONDS);
428+
} else {
429+
close(cause);
430+
}
431+
return;
432+
}
433+
if (!(response instanceof AuthenticateResponse)) {
434+
close(new IllegalStateException("Unexpected response type " + response.getClass()));
435+
return;
429436
}
430-
return;
431-
}
432-
if (!(response instanceof AuthenticateResponse)) {
433-
close(new IllegalStateException("Unexpected response type " + response.getClass()));
434-
return;
435-
}
436437

437-
synchronized (lock) {
438438
AuthenticateResponse authenticateResponse = (AuthenticateResponse) response;
439439
if (authenticateResponse.hasChallenge()) {
440440
sendAuthenticateRequest(((AuthenticateResponse) response).getChallenge());
@@ -544,10 +544,6 @@ ByteBuf toByteBuf(ByteBufAllocator allocator) {
544544
}
545545
}
546546

547-
private class DefaultAuthenticateContext implements ClientAuthenticator.AuthenticateContext {
548-
@Override
549-
public Channel channel() {
550-
return channel;
551-
}
552-
}
547+
private static class DefaultAuthenticateContext
548+
implements ClientAuthenticator.AuthenticateContext {}
553549
}

fluss-rpc/src/main/java/com/alibaba/fluss/rpc/netty/server/NettyServerHandler.java

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333
import com.alibaba.fluss.security.auth.ServerAuthenticator;
3434
import com.alibaba.fluss.shaded.netty4.io.netty.buffer.ByteBuf;
3535
import com.alibaba.fluss.shaded.netty4.io.netty.buffer.ByteBufAllocator;
36-
import com.alibaba.fluss.shaded.netty4.io.netty.channel.Channel;
3736
import com.alibaba.fluss.shaded.netty4.io.netty.channel.ChannelFutureListener;
3837
import com.alibaba.fluss.shaded.netty4.io.netty.channel.ChannelHandlerContext;
3938
import com.alibaba.fluss.shaded.netty4.io.netty.channel.ChannelInboundHandlerAdapter;
@@ -366,10 +365,6 @@ public boolean isAuthenticating() {
366365
}
367366
}
368367

369-
private class DefaultAuthenticateContext implements ServerAuthenticator.AuthenticateContext {
370-
@Override
371-
public Channel channel() {
372-
return ctx.channel();
373-
}
374-
}
368+
private static class DefaultAuthenticateContext
369+
implements ServerAuthenticator.AuthenticateContext {}
375370
}

0 commit comments

Comments
 (0)