This is an automated email from the ASF dual-hosted git repository.
andor pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/zookeeper.git
The following commit(s) were added to refs/heads/master by this push:
new c418b44 ZOOKEEPER-2892: Improve lazy initialize and close stream for
`PrepRequestProcessor`
c418b44 is described below
commit c418b4456794b3ee7fdb7adfb60a91e36345fa20
Author: asdf2014 <[email protected]>
AuthorDate: Thu Feb 7 11:22:55 2019 +0100
ZOOKEEPER-2892: Improve lazy initialize and close stream for
`PrepRequestProcessor`
Improve lazy initialize and close stream for `PrepRequestProcessor`
* Delay the initialization of `ChangeRecord` and `ReconfigRequest` variables
* Close the `ByteArrayOutputStream` I/O stream
hanm PTAL
Author: asdf2014 <[email protected]>
Reviewers: [email protected], [email protected]
Closes #361 from asdf2014/ZOOKEEPER-2892
---
.../zookeeper/server/PrepRequestProcessor.java | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git
a/zookeeper-server/src/main/java/org/apache/zookeeper/server/PrepRequestProcessor.java
b/zookeeper-server/src/main/java/org/apache/zookeeper/server/PrepRequestProcessor.java
index be87530..9bea2b1 100644
---
a/zookeeper-server/src/main/java/org/apache/zookeeper/server/PrepRequestProcessor.java
+++
b/zookeeper-server/src/main/java/org/apache/zookeeper/server/PrepRequestProcessor.java
@@ -375,7 +375,6 @@ public class PrepRequestProcessor extends
ZooKeeperCriticalThread implements
case OpCode.deleteContainer: {
String path = new String(request.request.array());
String parentPath = getParentPathAndValidate(path);
- ChangeRecord parentRecord = getRecordForPath(parentPath);
ChangeRecord nodeRecord = getRecordForPath(path);
if (nodeRecord.childCount > 0) {
throw new KeeperException.NotEmptyException(path);
@@ -383,6 +382,7 @@ public class PrepRequestProcessor extends
ZooKeeperCriticalThread implements
if (EphemeralType.get(nodeRecord.stat.getEphemeralOwner()) ==
EphemeralType.NORMAL) {
throw new KeeperException.BadVersionException(path);
}
+ ChangeRecord parentRecord = getRecordForPath(parentPath);
request.setTxn(new DeleteTxn(path));
parentRecord =
parentRecord.duplicate(request.getHdr().getZxid());
parentRecord.childCount--;
@@ -398,8 +398,8 @@ public class PrepRequestProcessor extends
ZooKeeperCriticalThread implements
String path = deleteRequest.getPath();
String parentPath = getParentPathAndValidate(path);
ChangeRecord parentRecord = getRecordForPath(parentPath);
- ChangeRecord nodeRecord = getRecordForPath(path);
checkACL(zks, request.cnxn, parentRecord.acl,
ZooDefs.Perms.DELETE, request.authInfo, path, null);
+ ChangeRecord nodeRecord = getRecordForPath(path);
checkAndIncVersion(nodeRecord.stat.getVersion(),
deleteRequest.getVersion(), path);
if (nodeRecord.childCount > 0) {
throw new KeeperException.NotEmptyException(path);
@@ -436,7 +436,6 @@ public class PrepRequestProcessor extends
ZooKeeperCriticalThread implements
}
zks.sessionTracker.checkSession(request.sessionId,
request.getOwner());
- ReconfigRequest reconfigRequest = (ReconfigRequest)record;
LeaderZooKeeperServer lzks;
try {
lzks = (LeaderZooKeeperServer)zks;
@@ -449,6 +448,7 @@ public class PrepRequestProcessor extends
ZooKeeperCriticalThread implements
if
(lastSeenQV.getVersion()!=lzks.self.getQuorumVerifier().getVersion()) {
throw new KeeperException.ReconfigInProgress();
}
+ ReconfigRequest reconfigRequest = (ReconfigRequest)record;
long configId = reconfigRequest.getCurConfigId();
if (configId != -1 &&
configId!=lzks.self.getLastSeenQuorumVerifier().getVersion()){
@@ -825,12 +825,12 @@ public class PrepRequestProcessor extends
ZooKeeperCriticalThread implements
//FIXME: I don't want to have to serialize it here and then
// immediately deserialize in next processor. But I'm
// not sure how else to get the txn stored into our
list.
- ByteArrayOutputStream baos = new ByteArrayOutputStream();
- BinaryOutputArchive boa =
BinaryOutputArchive.getArchive(baos);
- txn.serialize(boa, "request") ;
- ByteBuffer bb = ByteBuffer.wrap(baos.toByteArray());
-
- txns.add(new Txn(type, bb.array()));
+ try (ByteArrayOutputStream baos = new
ByteArrayOutputStream()) {
+ BinaryOutputArchive boa =
BinaryOutputArchive.getArchive(baos);
+ txn.serialize(boa, "request");
+ ByteBuffer bb = ByteBuffer.wrap(baos.toByteArray());
+ txns.add(new Txn(type, bb.array()));
+ }
}
request.setHdr(new TxnHeader(request.sessionId, request.cxid,
zxid,
@@ -956,10 +956,10 @@ public class PrepRequestProcessor extends
ZooKeeperCriticalThread implements
// check for well formed ACLs
// This resolves https://issues.apache.org/jira/browse/ZOOKEEPER-1877
List<ACL> uniqacls = removeDuplicates(acls);
- List<ACL> rv = new LinkedList<ACL>();
if (uniqacls == null || uniqacls.size() == 0) {
throw new KeeperException.InvalidACLException(path);
}
+ List<ACL> rv = new LinkedList<ACL>();
for (ACL a: uniqacls) {
LOG.debug("Processing ACL: {}", a);
if (a == null) {
