Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Revert "BOOKKEEPER-1018: Allow client to select older V2 protocol (no… #124

Closed
wants to merge 1 commit into from
Closed

Revert "BOOKKEEPER-1018: Allow client to select older V2 protocol (no… #124

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
23 changes: 1 addition & 22 deletions bookkeeper-server/src/main/java/org/apache/bookkeeper/conf/ClientConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ public class ClientConfiguration extends AbstractConfiguration {
protected final static String CLIENT_WRITEBUFFER_HIGH_WATER_MARK = "clientWriteBufferHighWaterMark";
protected final static String CLIENT_CONNECT_TIMEOUT_MILLIS = "clientConnectTimeoutMillis";
protected final static String NUM_CHANNELS_PER_BOOKIE = "numChannelsPerBookie";
protected final static String USE_V2_WIRE_PROTOCOL = "useV2WireProtocol";

// Read Parameters
protected final static String READ_TIMEOUT = "readTimeout";
protected final static String SPECULATIVE_READ_TIMEOUT = "speculativeReadTimeout";
Expand Down Expand Up @@ -435,27 +435,6 @@ public ClientConfiguration setNumChannelsPerBookie(int numChannelsPerBookie) {
return this;
}

/**
* Use older Bookkeeper wire protocol (no protobuf)
*
* @return whether or not to use older Bookkeeper wire protocol (no protobuf)
*/
public boolean getUseV2WireProtocol() {
return getBoolean(USE_V2_WIRE_PROTOCOL, false);
}

/**
* Set whether or not to use older Bookkeeper wire protocol (no protobuf)
*
* @param useV2WireProtocol
* whether or not to use older Bookkeeper wire protocol (no protobuf)
* @return client configuration.
*/
public ClientConfiguration setUseV2WireProtocol(boolean useV2WireProtocol) {
setProperty(USE_V2_WIRE_PROTOCOL, useV2WireProtocol);
return this;
}

/**
* Get zookeeper servers to connect
*
Expand Down
8 changes: 0 additions & 8 deletions bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/AuthHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -322,14 +322,6 @@ public void writeRequested(ChannelHandlerContext ctx,
} else {
waitingForAuth.add(e);
}
} else if (e.getMessage() instanceof BookieProtocol.Request) {
// let auth messages through, queue the rest
BookieProtocol.Request req = (BookieProtocol.Request)e.getMessage();
if (BookkeeperProtocol.OperationType.AUTH.getNumber() == req.getOpCode()) {
super.writeRequested(ctx, e);
} else {
waitingForAuth.add(e);
}
} // else just drop
}
}
Expand Down
3 changes: 0 additions & 3 deletions bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/BookieProtocol.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,9 +140,6 @@ short getFlags() {
* by the auth providers themselves.
*/
public static final byte AUTH = 3;
public static final byte READ_LAC = 4;
public static final byte WRITE_LAC = 5;
public static final byte GET_BOOKIE_INFO = 6;

/**
* The error code that indicates success
Expand Down