Skip to content

Commit

Permalink
HBASE-28444 Bump org.apache.zookeeper:zookeeper from 3.8.3 to 3.8.4 (#…
Browse files Browse the repository at this point in the history 
…5765)

Signed-off-by: Bryan Beaudreault <bbeaudreault@apache.org>
Signed-off-by: Andrew Purtell <apurtell@apache.org>
  • Loading branch information
@Apache9
Apache9 authored Mar 21, 2024
1 parent 0763a74 commit ade6ab2
Show file tree
Hide file tree
Showing 3 changed files with 66 additions and 73 deletions.
6 changes: 3 additions & 3 deletions hbase-zookeeper/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKUtil.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -772,18 +772,18 @@ private static void createAndFailSilent(ZKWatcher zkw, CreateAndFailSilent cafs)
throws KeeperException {
CreateRequest create = (CreateRequest) toZooKeeperOp(zkw, cafs).toRequestRecord();
String znode = create.getPath();
RecoverableZooKeeper zk = zkw.getRecoverableZooKeeper();
try {
RecoverableZooKeeper zk = zkw.getRecoverableZooKeeper();
if (zk.exists(znode, false) == null) {
zk.create(znode, create.getData(), create.getAcl(), CreateMode.fromFlag(create.getFlags()));
}
} catch (KeeperException.NodeExistsException nee) {
// pass
} catch (KeeperException.NoAuthException nee) {
try {
if (null == zkw.getRecoverableZooKeeper().exists(znode, false)) {
if (zk.exists(znode, false) == null) {
// If we failed to create the file and it does not already exist.
throw (nee);
throw nee;
}
} catch (InterruptedException ie) {
zkw.interruptedException(ie);
Expand Down
131 changes: 62 additions & 69 deletions hbase-zookeeper/src/test/java/org/apache/hadoop/hbase/zookeeper/TestZKUtil.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,22 @@
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyBoolean;
import static org.mockito.ArgumentMatchers.anyList;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;

import java.io.IOException;
import java.util.Arrays;
import java.util.List;
import java.util.concurrent.Callable;
import java.util.concurrent.atomic.AtomicBoolean;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hbase.Abortable;
import org.apache.hadoop.hbase.HBaseClassTestRule;
Expand All @@ -45,6 +58,7 @@
import org.junit.ClassRule;
import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.mockito.AdditionalAnswers;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

Expand Down Expand Up @@ -139,31 +153,10 @@ public void testSetDataWithVersion() throws Exception {
assertEquals(2, v2);
}

/**
* A test for HBASE-3238
* @throws IOException A connection attempt to zk failed
* @throws InterruptedException One of the non ZKUtil actions was interrupted
* @throws KeeperException Any of the zookeeper connections had a KeeperException
*/
@Test
public void testCreateSilentIsReallySilent()
throws InterruptedException, KeeperException, IOException {
Configuration c = UTIL.getConfiguration();

String aclZnode = "/aclRoot";
String quorumServers = ZKConfig.getZKQuorumServersString(c);
int sessionTimeout = 5 * 1000; // 5 seconds
ZooKeeper zk = new ZooKeeper(quorumServers, sessionTimeout, EmptyWatcher.instance);
zk.addAuthInfo("digest", Bytes.toBytes("hbase:rox"));

// Save the previous ACL
Stat s;
List<ACL> oldACL;
while (true) {
private <V> V callAndIgnoreTransientError(Callable<V> action) throws Exception {
for (;;) {
try {
s = new Stat();
oldACL = zk.getACL("/", s);
break;
return action.call();
} catch (KeeperException e) {
switch (e.code()) {
case CONNECTIONLOSS:
Expand All @@ -177,54 +170,54 @@ public void testCreateSilentIsReallySilent()
}
}
}
}

// I set this acl after the attempted creation of the cluster home node.
// Add retries in case of retryable zk exceptions.
while (true) {
try {
zk.setACL("/", ZooDefs.Ids.CREATOR_ALL_ACL, -1);
break;
} catch (KeeperException e) {
switch (e.code()) {
case CONNECTIONLOSS:
case SESSIONEXPIRED:
case OPERATIONTIMEOUT:
LOG.warn("Possibly transient ZooKeeper exception: " + e);
Threads.sleep(100);
break;
default:
throw e;
}
}
}
/**
* A test for HBASE-3238
*/
@Test
public void testCreateSilentIsReallySilent() throws Exception {
Configuration c = UTIL.getConfiguration();

while (true) {
try {
zk.create(aclZnode, null, ZooDefs.Ids.CREATOR_ALL_ACL, CreateMode.PERSISTENT);
break;
} catch (KeeperException e) {
switch (e.code()) {
case CONNECTIONLOSS:
case SESSIONEXPIRED:
case OPERATIONTIMEOUT:
LOG.warn("Possibly transient ZooKeeper exception: " + e);
Threads.sleep(100);
break;
default:
throw e;
String aclZnode = "/aclRoot";
String quorumServers = ZKConfig.getZKQuorumServersString(c);
int sessionTimeout = 5 * 1000; // 5 seconds
try (ZooKeeper zk = new ZooKeeper(quorumServers, sessionTimeout, EmptyWatcher.instance)) {
zk.addAuthInfo("digest", Bytes.toBytes("hbase:rox"));

// Save the previous ACL
List<ACL> oldACL = callAndIgnoreTransientError(() -> zk.getACL("/", new Stat()));

// I set this acl after the attempted creation of the cluster home node.
// Add retries in case of retryable zk exceptions.
callAndIgnoreTransientError(() -> zk.setACL("/", ZooDefs.Ids.CREATOR_ALL_ACL, -1));

ZKWatcher watcher = spy(ZKW);
RecoverableZooKeeper rzk = mock(RecoverableZooKeeper.class,
AdditionalAnswers.delegatesTo(ZKW.getRecoverableZooKeeper()));
when(watcher.getRecoverableZooKeeper()).thenReturn(rzk);
AtomicBoolean firstExists = new AtomicBoolean(true);
doAnswer(inv -> {
String path = inv.getArgument(0);
boolean watch = inv.getArgument(1);
Stat stat = ZKW.getRecoverableZooKeeper().exists(path, watch);
// create the znode after first exists check, this is to simulate that we enter the create
// branch but we have no permission for creation, but the znode has been created by others
if (firstExists.compareAndSet(true, false)) {
callAndIgnoreTransientError(() -> zk.create(aclZnode, null,
Arrays.asList(new ACL(ZooDefs.Perms.READ, ZooDefs.Ids.ANYONE_ID_UNSAFE),
new ACL(ZooDefs.Perms.ALL, ZooDefs.Ids.AUTH_IDS)),
CreateMode.PERSISTENT));
}
}
}
zk.close();
ZKUtil.createAndFailSilent(ZKW, aclZnode);

// Restore the ACL
ZooKeeper zk3 = new ZooKeeper(quorumServers, sessionTimeout, EmptyWatcher.instance);
zk3.addAuthInfo("digest", Bytes.toBytes("hbase:rox"));
try {
zk3.setACL("/", oldACL, -1);
} finally {
zk3.close();
return stat;
}).when(rzk).exists(any(), anyBoolean());
ZKUtil.createAndFailSilent(watcher, aclZnode);
// make sure we call the exists method twice and create once
verify(rzk, times(2)).exists(any(), anyBoolean());
verify(rzk).create(anyString(), any(), anyList(), any());
// Restore the ACL
zk.addAuthInfo("digest", Bytes.toBytes("hbase:rox"));
zk.setACL("/", oldACL, -1);
}
}

Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -861,7 +861,7 @@
<protobuf.plugin.version>0.6.1</protobuf.plugin.version>
<thrift.path>thrift</thrift.path>
<thrift.version>0.14.1</thrift.version>
<zookeeper.version>3.8.3</zookeeper.version>
<zookeeper.version>3.8.4</zookeeper.version>
<jline.version>2.11</jline.version>
<slf4j.version>1.7.30</slf4j.version>
<clover.version>4.0.3</clover.version>
Expand Down

0 comments on commit ade6ab2

Please sign in to comment.