HBASE-27020 Fix spotless warn for master branch (#4417)
Signed-off-by: Duo Zhang <zhangduo@apache.org> Reviewed by: Rushabh Shah <shahrs87@gmail.com>
This commit is contained in:
parent
c269dc5711
commit
a712f9fa34
|
@ -1232,13 +1232,11 @@ public class HStore
|
|||
allowedOnPath = ".*/(HStore|TestHStore).java")
|
||||
void replaceStoreFiles(Collection<HStoreFile> compactedFiles, Collection<HStoreFile> result,
|
||||
boolean writeCompactionMarker) throws IOException {
|
||||
storeEngine.replaceStoreFiles(compactedFiles, result,
|
||||
() -> {
|
||||
if (writeCompactionMarker) {
|
||||
writeCompactionWalRecord(compactedFiles, result);
|
||||
}
|
||||
},
|
||||
() -> {
|
||||
storeEngine.replaceStoreFiles(compactedFiles, result, () -> {
|
||||
if (writeCompactionMarker) {
|
||||
writeCompactionWalRecord(compactedFiles, result);
|
||||
}
|
||||
}, () -> {
|
||||
synchronized (filesCompacting) {
|
||||
filesCompacting.removeAll(compactedFiles);
|
||||
}
|
||||
|
|
|
@ -34,7 +34,6 @@ import java.util.concurrent.ExecutorService;
|
|||
import java.util.concurrent.locks.ReadWriteLock;
|
||||
import java.util.concurrent.locks.ReentrantReadWriteLock;
|
||||
import java.util.function.Function;
|
||||
|
||||
import org.apache.hadoop.conf.Configuration;
|
||||
import org.apache.hadoop.fs.Path;
|
||||
import org.apache.hadoop.hbase.CellComparator;
|
||||
|
@ -408,7 +407,9 @@ public abstract class StoreEngine<SF extends StoreFlusher, CP extends Compaction
|
|||
List<HStoreFile> openedFiles = openStoreFiles(toBeAddedFiles, false);
|
||||
|
||||
// propogate the file changes to the underlying store file manager
|
||||
replaceStoreFiles(toBeRemovedStoreFiles, openedFiles, () -> {}, () -> {}); // won't throw an exception
|
||||
replaceStoreFiles(toBeRemovedStoreFiles, openedFiles, () -> {
|
||||
}, () -> {
|
||||
}); // won't throw an exception
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -491,8 +492,8 @@ public abstract class StoreEngine<SF extends StoreFlusher, CP extends Compaction
|
|||
}
|
||||
|
||||
public void replaceStoreFiles(Collection<HStoreFile> compactedFiles,
|
||||
Collection<HStoreFile> newFiles, IOExceptionRunnable walMarkerWriter,
|
||||
Runnable actionUnderLock) throws IOException {
|
||||
Collection<HStoreFile> newFiles, IOExceptionRunnable walMarkerWriter, Runnable actionUnderLock)
|
||||
throws IOException {
|
||||
storeFileTracker.replace(StoreUtils.toStoreFileInfo(compactedFiles),
|
||||
StoreUtils.toStoreFileInfo(newFiles));
|
||||
walMarkerWriter.run();
|
||||
|
|
|
@ -538,7 +538,6 @@ public class ReplicationSource implements ReplicationSourceInterface {
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
if (!this.isSourceActive()) {
|
||||
setSourceStartupStatus(false);
|
||||
if (Thread.currentThread().isInterrupted()) {
|
||||
|
@ -569,7 +568,7 @@ public class ReplicationSource implements ReplicationSourceInterface {
|
|||
}
|
||||
}
|
||||
|
||||
if(!this.isSourceActive()) {
|
||||
if (!this.isSourceActive()) {
|
||||
setSourceStartupStatus(false);
|
||||
if (Thread.currentThread().isInterrupted()) {
|
||||
// If source is not running and thread is interrupted this means someone has tried to
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/**
|
||||
/*
|
||||
* 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
|
||||
|
@ -39,7 +39,7 @@ import org.junit.rules.TestName;
|
|||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
@Category({ MediumTests.class, ClientTests.class})
|
||||
@Category({ MediumTests.class, ClientTests.class })
|
||||
public class TestBadReplicationPeer {
|
||||
@ClassRule
|
||||
public static final HBaseClassTestRule CLASS_RULE =
|
||||
|
@ -65,15 +65,15 @@ public class TestBadReplicationPeer {
|
|||
}
|
||||
|
||||
/*
|
||||
Add dummy peer and make sure that we are able to remove that peer.
|
||||
* Add dummy peer and make sure that we are able to remove that peer.
|
||||
*/
|
||||
@Test
|
||||
public void testRemovePeerSucceeds() throws IOException {
|
||||
String peerId = "dummypeer_1";
|
||||
try (Connection connection = ConnectionFactory.createConnection(conf);
|
||||
Admin admin = connection.getAdmin()){
|
||||
Admin admin = connection.getAdmin()) {
|
||||
ReplicationPeerConfigBuilder rpcBuilder = ReplicationPeerConfig.newBuilder();
|
||||
String quorum = TEST_UTIL.getHBaseCluster().getMaster().getZooKeeper().getQuorum();
|
||||
String quorum = TEST_UTIL.getHBaseCluster().getMaster().getZooKeeper().getQuorum();
|
||||
rpcBuilder.setClusterKey(quorum + ":/1");
|
||||
ReplicationPeerConfig rpc = rpcBuilder.build();
|
||||
admin.addReplicationPeer(peerId, rpc);
|
||||
|
|
Loading…
Reference in New Issue