Skip to content

Commit f7a8682

Browse files
committed
Run mvn spotless:apply
Change-Id: Ibb60d6e12ad51c8787aa308577acf512017c64f2
1 parent 7c9b69c commit f7a8682

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterRpcServices.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,6 @@
9292
import org.apache.hadoop.hbase.namequeues.NamedQueueRecorder;
9393
import org.apache.hadoop.hbase.namequeues.request.NamedQueueGetRequest;
9494
import org.apache.hadoop.hbase.namequeues.response.NamedQueueGetResponse;
95-
import org.apache.hadoop.hbase.net.Address;
9695
import org.apache.hadoop.hbase.procedure.MasterProcedureManager;
9796
import org.apache.hadoop.hbase.procedure2.LockType;
9897
import org.apache.hadoop.hbase.procedure2.LockedResource;
@@ -2531,8 +2530,8 @@ public ClearDeadServersResponse clearDeadServers(RpcController controller,
25312530
DeadServer deadServer = master.getServerManager().getDeadServers();
25322531
for (HBaseProtos.ServerName pbServer : request.getServerNameList()) {
25332532
ServerName server = ProtobufUtil.toServerName(pbServer);
2534-
final boolean deadInProcess = master.getProcedures().stream().anyMatch(
2535-
p -> (p instanceof ServerCrashProcedure)
2533+
final boolean deadInProcess =
2534+
master.getProcedures().stream().anyMatch(p -> (p instanceof ServerCrashProcedure)
25362535
&& ((ServerCrashProcedure) p).getServerName().equals(server));
25372536
if (deadInProcess) {
25382537
throw new ServiceException(

hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestRollingRestart.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -228,8 +228,8 @@ private boolean isDeadServerSCPExecuted(ServerName serverName) throws IOExceptio
228228
&& ((ServerCrashProcedure) p).getServerName().equals(serverName));
229229
}
230230

231-
private void waitForRSShutdownToStartAndFinish(MasterThread activeMaster,
232-
ServerName serverName) throws InterruptedException, IOException {
231+
private void waitForRSShutdownToStartAndFinish(MasterThread activeMaster, ServerName serverName)
232+
throws InterruptedException, IOException {
233233
ServerManager sm = activeMaster.getMaster().getServerManager();
234234
// First wait for it to be in dead list
235235
while (!sm.getDeadServers().isDeadServer(serverName)) {

0 commit comments

Comments
 (0)