forked from apache/zookeeper
-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
ZOOKEEPER-4492: Merge readOnly field into ConnectRequest and Response
According to [this comment in ZOOKEEPER-102](https://issues.apache.org/jira/browse/ZOOKEEPER-102?focusedCommentId=16977000&page=com.atlassian.jira.plugin.system.issuetabpanels%3Acomment-tabpanel#comment-16977000) I introduce a `Protocol` abstraction and going to moving all wire protocol concept into `cnxn` and this scope, so that client and server's business logics handle only deserialized/real record. cc eolivelli maoling Randgalt This supersedes apache#1832. Author: tison <wander4096@gmail.com> Reviewers: Enrico Olivelli <eolivelli@apache.org>, Mate Szalay-Beko <symat@apache.org> Closes apache#1837 from tisonkun/protocol
- Loading branch information
1 parent
bb34dc1
commit b154a55
Showing
13 changed files
with
155 additions
and
97 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
121 changes: 121 additions & 0 deletions
121
zookeeper-server/src/main/java/org/apache/zookeeper/compat/ProtocolManager.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,121 @@ | ||
| /* | ||
| * 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.zookeeper.compat; | ||
|
|
||
| import java.io.IOException; | ||
| import org.apache.jute.InputArchive; | ||
| import org.apache.zookeeper.proto.ConnectRequest; | ||
| import org.apache.zookeeper.proto.ConnectResponse; | ||
|
|
||
| /** | ||
| * A manager for switching behaviours between difference wire protocol. | ||
| * <p> | ||
| * Basically, wire protocol should be backward and forward compatible between minor versions. | ||
| * However, there are several cases that it's different due to Jute's limitations. | ||
| */ | ||
| public final class ProtocolManager { | ||
| private volatile Boolean isReadonlyAvailable = null; | ||
|
|
||
| public boolean isReadonlyAvailable() { | ||
| return isReadonlyAvailable != null && isReadonlyAvailable; | ||
| } | ||
|
|
||
| /** | ||
| * Deserializing {@link ConnectRequest} should be specially handled for request from client | ||
| * version before and including ZooKeeper 3.3 which doesn't understand readOnly field. | ||
| */ | ||
| public ConnectRequest deserializeConnectRequest(InputArchive inputArchive) throws IOException { | ||
| if (isReadonlyAvailable != null) { | ||
| if (isReadonlyAvailable) { | ||
| return deserializeConnectRequestWithReadonly(inputArchive); | ||
| } else { | ||
| return deserializeConnectRequestWithoutReadonly(inputArchive); | ||
| } | ||
| } | ||
|
|
||
| final ConnectRequest request = deserializeConnectRequestWithoutReadonly(inputArchive); | ||
| try { | ||
| request.setReadOnly(inputArchive.readBool("readOnly")); | ||
| this.isReadonlyAvailable = true; | ||
| } catch (Exception e) { | ||
| request.setReadOnly(false); // old version doesn't have readonly concept | ||
| this.isReadonlyAvailable = false; | ||
| } | ||
| return request; | ||
| } | ||
|
|
||
| private ConnectRequest deserializeConnectRequestWithReadonly(InputArchive inputArchive) throws IOException { | ||
| final ConnectRequest request = new ConnectRequest(); | ||
| request.deserialize(inputArchive, "connect"); | ||
| return request; | ||
| } | ||
|
|
||
| private ConnectRequest deserializeConnectRequestWithoutReadonly(InputArchive inputArchive) throws IOException { | ||
| final ConnectRequest request = new ConnectRequest(); | ||
| inputArchive.startRecord("connect"); | ||
| request.setProtocolVersion(inputArchive.readInt("protocolVersion")); | ||
| request.setLastZxidSeen(inputArchive.readLong("lastZxidSeen")); | ||
| request.setTimeOut(inputArchive.readInt("timeOut")); | ||
| request.setSessionId(inputArchive.readLong("sessionId")); | ||
| request.setPasswd(inputArchive.readBuffer("passwd")); | ||
| inputArchive.endRecord("connect"); | ||
| return request; | ||
| } | ||
|
|
||
| /** | ||
| * Deserializing {@link ConnectResponse} should be specially handled for response from server | ||
| * version before and including ZooKeeper 3.3 which doesn't understand readOnly field. | ||
| */ | ||
| public ConnectResponse deserializeConnectResponse(InputArchive inputArchive) throws IOException { | ||
| if (isReadonlyAvailable != null) { | ||
| if (isReadonlyAvailable) { | ||
| return deserializeConnectResponseWithReadonly(inputArchive); | ||
| } else { | ||
| return deserializeConnectResponseWithoutReadonly(inputArchive); | ||
| } | ||
| } | ||
|
|
||
| final ConnectResponse response = deserializeConnectResponseWithoutReadonly(inputArchive); | ||
| try { | ||
| response.setReadOnly(inputArchive.readBool("readOnly")); | ||
| this.isReadonlyAvailable = true; | ||
| } catch (Exception e) { | ||
| response.setReadOnly(false); // old version doesn't have readonly concept | ||
| this.isReadonlyAvailable = false; | ||
| } | ||
| return response; | ||
| } | ||
|
|
||
| private ConnectResponse deserializeConnectResponseWithReadonly(InputArchive inputArchive) throws IOException { | ||
| final ConnectResponse response = new ConnectResponse(); | ||
| response.deserialize(inputArchive, "connect"); | ||
| return response; | ||
| } | ||
|
|
||
| private ConnectResponse deserializeConnectResponseWithoutReadonly(InputArchive inputArchive) throws IOException { | ||
| final ConnectResponse response = new ConnectResponse(); | ||
| inputArchive.startRecord("connect"); | ||
| response.setProtocolVersion(inputArchive.readInt("protocolVersion")); | ||
| response.setTimeOut(inputArchive.readInt("timeOut")); | ||
| response.setSessionId(inputArchive.readLong("sessionId")); | ||
| response.setPasswd(inputArchive.readBuffer("passwd")); | ||
| inputArchive.endRecord("connect"); | ||
| return response; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.