HBASE-25559 Terminate threads of oldsources while RS is closing (#2938)
Signed-off-by: Viraj Jasani <vjasani@apache.org> Signed-off-by: stack <stack@apache.org> Signed-off-by: Wellington Chevreuil <wchevreuil@apache.org>
This commit is contained in:
parent
0353909bc2
commit
4a3ff98943
|
@ -112,7 +112,7 @@ public class ReplicationSource implements ReplicationSourceInterface {
|
|||
// Maximum number of retries before taking bold actions
|
||||
private int maxRetriesMultiplier;
|
||||
// Indicates if this particular source is running
|
||||
private volatile boolean sourceRunning = false;
|
||||
volatile boolean sourceRunning = false;
|
||||
// Metrics for this source
|
||||
private MetricsSource metrics;
|
||||
// WARN threshold for the number of queued logs, defaults to 2
|
||||
|
|
|
@ -1020,6 +1020,9 @@ public class ReplicationSourceManager implements ReplicationListener {
|
|||
for (ReplicationSourceInterface source : this.sources.values()) {
|
||||
source.terminate("Region server is closing");
|
||||
}
|
||||
for (ReplicationSourceInterface source : this.oldsources) {
|
||||
source.terminate("Region server is closing");
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
@ -0,0 +1,109 @@
|
|||
/*
|
||||
* 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.hadoop.hbase.replication.regionserver;
|
||||
|
||||
import static org.junit.Assert.assertFalse;
|
||||
import static org.junit.Assert.assertTrue;
|
||||
|
||||
import java.util.Optional;
|
||||
import java.util.stream.Stream;
|
||||
|
||||
import org.apache.hadoop.hbase.HBaseClassTestRule;
|
||||
import org.apache.hadoop.hbase.HConstants;
|
||||
import org.apache.hadoop.hbase.TableName;
|
||||
import org.apache.hadoop.hbase.client.ColumnFamilyDescriptorBuilder;
|
||||
import org.apache.hadoop.hbase.client.Put;
|
||||
import org.apache.hadoop.hbase.client.Table;
|
||||
import org.apache.hadoop.hbase.client.TableDescriptor;
|
||||
import org.apache.hadoop.hbase.client.TableDescriptorBuilder;
|
||||
import org.apache.hadoop.hbase.regionserver.HRegionServer;
|
||||
import org.apache.hadoop.hbase.replication.TestReplicationBase;
|
||||
import org.apache.hadoop.hbase.testclassification.MediumTests;
|
||||
import org.apache.hadoop.hbase.testclassification.ReplicationTests;
|
||||
import org.apache.hadoop.hbase.util.Bytes;
|
||||
import org.apache.hadoop.hbase.util.JVMClusterUtil;
|
||||
import org.junit.BeforeClass;
|
||||
import org.junit.ClassRule;
|
||||
import org.junit.Rule;
|
||||
import org.junit.Test;
|
||||
import org.junit.experimental.categories.Category;
|
||||
import org.junit.rules.TestName;
|
||||
|
||||
@Category({ ReplicationTests.class, MediumTests.class})
|
||||
public class TestReplicationSourceManagerJoin extends TestReplicationBase {
|
||||
|
||||
@ClassRule
|
||||
public static final HBaseClassTestRule CLASS_RULE =
|
||||
HBaseClassTestRule.forClass(TestReplicationSourceManagerJoin.class);
|
||||
|
||||
@Rule
|
||||
public TestName testName = new TestName();
|
||||
|
||||
@BeforeClass
|
||||
public static void setUpBeforeClass() throws Exception {
|
||||
// NUM_SLAVES1 is presumed 2 in below.
|
||||
NUM_SLAVES1 = 2;
|
||||
TestReplicationBase.setUpBeforeClass();
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testReplicationSourcesTerminate() throws Exception {
|
||||
// Create table in source cluster only, let TableNotFoundException block peer to avoid
|
||||
// recovered source end.
|
||||
TableName tableName = TableName.valueOf(testName.getMethodName());
|
||||
TableDescriptor td = TableDescriptorBuilder.newBuilder(tableName)
|
||||
.setColumnFamily(ColumnFamilyDescriptorBuilder.newBuilder(famName)
|
||||
.setScope(HConstants.REPLICATION_SCOPE_GLOBAL).build())
|
||||
.setColumnFamily(ColumnFamilyDescriptorBuilder.of(noRepfamName)).build();
|
||||
hbaseAdmin.createTable(td);
|
||||
assertFalse(UTIL2.getAdmin().tableExists(tableName));
|
||||
Table table = UTIL1.getConnection().getTable(tableName);
|
||||
// load data
|
||||
for (int i = 0; i < NB_ROWS_IN_BATCH; i++) {
|
||||
table.put(new Put(Bytes.toBytes(i)).addColumn(famName, row, row));
|
||||
}
|
||||
// Kill rs holding table region. There are only TWO servers. We depend on it.
|
||||
Optional<HRegionServer> server =
|
||||
UTIL1.getMiniHBaseCluster().getLiveRegionServerThreads().stream()
|
||||
.map(JVMClusterUtil.RegionServerThread::getRegionServer)
|
||||
.filter(rs -> !rs.getRegions(tableName).isEmpty()).findAny();
|
||||
assertTrue(server.isPresent());
|
||||
server.get().abort("stopping for test");
|
||||
|
||||
UTIL1.waitFor(60000, () -> 1 == UTIL1.getMiniHBaseCluster().getNumLiveRegionServers());
|
||||
UTIL1.waitTableAvailable(tableName);
|
||||
// Wait for recovered source running
|
||||
HRegionServer rs =
|
||||
UTIL1.getMiniHBaseCluster().getLiveRegionServerThreads().get(0).getRegionServer();
|
||||
ReplicationSourceManager manager = rs.getReplicationSourceService().getReplicationManager();
|
||||
UTIL1.waitFor(60000, () -> !manager.getOldSources().isEmpty());
|
||||
|
||||
assertFalse(manager.getSources().isEmpty());
|
||||
assertFalse(manager.getOldSources().isEmpty());
|
||||
|
||||
// Check all sources running before manager.join(), terminated after manager.join().
|
||||
Stream.concat(manager.getSources().stream(), manager.getOldSources().stream())
|
||||
.filter(src -> src instanceof ReplicationSource)
|
||||
.forEach(src -> assertTrue(((ReplicationSource) src).sourceRunning));
|
||||
manager.join();
|
||||
Stream.concat(manager.getSources().stream(), manager.getOldSources().stream())
|
||||
.filter(src -> src instanceof ReplicationSource)
|
||||
.forEach(src -> assertFalse(((ReplicationSource) src).sourceRunning));
|
||||
}
|
||||
|
||||
}
|
Loading…
Reference in New Issue