-
Notifications
You must be signed in to change notification settings - Fork 3.4k
HBASE-29611: With FILE based SFT, the list of HFiles we maintain in .filelist is n… #7361
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from 1 commit
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
69 changes: 69 additions & 0 deletions
69
...ache/hadoop/hbase/regionserver/storefiletracker/DummyStoreFileTrackerForReadOnlyMode.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,69 @@ | ||
| /* | ||
| * 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.regionserver.storefiletracker; | ||
|
|
||
| import java.io.IOException; | ||
| import java.util.Collection; | ||
| import java.util.Collections; | ||
| import java.util.List; | ||
| import org.apache.hadoop.conf.Configuration; | ||
| import org.apache.hadoop.hbase.regionserver.StoreFileInfo; | ||
|
|
||
| public class DummyStoreFileTrackerForReadOnlyMode extends StoreFileTrackerBase { | ||
| private boolean readOnlyUsed = false; | ||
| private boolean compactionExecuted = false; | ||
|
|
||
| public DummyStoreFileTrackerForReadOnlyMode(Configuration conf, boolean isPrimaryReplica) { | ||
| super(conf, isPrimaryReplica, null); | ||
| } | ||
|
|
||
| @Override | ||
| protected void doAddCompactionResults(Collection<StoreFileInfo> compactedFiles, | ||
| Collection<StoreFileInfo> newFiles) { | ||
| compactionExecuted = true; | ||
| } | ||
|
|
||
| @Override | ||
| protected void doSetStoreFiles(Collection<StoreFileInfo> files) throws IOException { | ||
|
|
||
| } | ||
|
|
||
| @Override | ||
| protected List<StoreFileInfo> doLoadStoreFiles(boolean readOnly) { | ||
| readOnlyUsed = readOnly; | ||
| return Collections.emptyList(); | ||
| } | ||
|
|
||
| @Override | ||
| protected void doAddNewStoreFiles(Collection<StoreFileInfo> newFiles) throws IOException { | ||
|
|
||
| } | ||
|
|
||
| boolean wasReadOnlyLoad() { | ||
| return readOnlyUsed; | ||
| } | ||
|
|
||
| boolean wasCompactionExecuted() { | ||
| return compactionExecuted; | ||
| } | ||
|
|
||
| @Override | ||
| public boolean requireWritingToTmpDirFirst() { | ||
| return false; | ||
| } | ||
| } |
90 changes: 90 additions & 0 deletions
90
...ache/hadoop/hbase/regionserver/storefiletracker/TestStoreFileTrackerBaseReadOnlyMode.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,90 @@ | ||
| /* | ||
| * 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.regionserver.storefiletracker; | ||
|
|
||
| import static org.junit.Assert.assertFalse; | ||
| import static org.junit.Assert.assertTrue; | ||
|
|
||
| import java.util.Collections; | ||
| import org.apache.hadoop.hbase.HBaseClassTestRule; | ||
| import org.apache.hadoop.hbase.TestRefreshHFilesBase; | ||
| import org.apache.hadoop.hbase.master.procedure.TestRefreshHFilesProcedureWithReadOnlyConf; | ||
| import org.apache.hadoop.hbase.testclassification.RegionServerTests; | ||
| import org.apache.hadoop.hbase.testclassification.SmallTests; | ||
| import org.junit.After; | ||
| import org.junit.Before; | ||
| import org.junit.ClassRule; | ||
| import org.junit.Test; | ||
| import org.junit.experimental.categories.Category; | ||
|
|
||
| @Category({ RegionServerTests.class, SmallTests.class }) | ||
| public class TestStoreFileTrackerBaseReadOnlyMode extends TestRefreshHFilesBase { | ||
| private DummyStoreFileTrackerForReadOnlyMode tracker; | ||
|
|
||
| @ClassRule | ||
| public static final HBaseClassTestRule CLASS_RULE = | ||
| HBaseClassTestRule.forClass(TestRefreshHFilesProcedureWithReadOnlyConf.class); | ||
|
|
||
| @Before | ||
| public void setup() throws Exception { | ||
| // When true is passed only setup for readonly property is done. | ||
| // The initial ReadOnly property will be false for table creation | ||
| baseSetup(true); | ||
| } | ||
|
|
||
| @After | ||
| public void tearDown() throws Exception { | ||
| baseTearDown(); | ||
| } | ||
|
|
||
| @Test | ||
| public void testLoadReadOnlyWhenGlobalReadOnlyEnabled() throws Exception { | ||
| try { | ||
| setReadOnlyMode(true); | ||
| tracker = new DummyStoreFileTrackerForReadOnlyMode(conf, true); | ||
| tracker.load(); | ||
| assertTrue("Tracker should be in read-only mode", tracker.wasReadOnlyLoad()); | ||
| } catch (Exception e) { | ||
| throw new RuntimeException(e); | ||
| } finally { | ||
| setReadOnlyMode(false); | ||
| } | ||
| } | ||
|
|
||
| @Test | ||
| public void testReplaceSkippedWhenGlobalReadOnlyEnabled() throws Exception { | ||
| try { | ||
| setReadOnlyMode(true); | ||
| tracker = new DummyStoreFileTrackerForReadOnlyMode(conf, true); | ||
| tracker.replace(Collections.emptyList(), Collections.emptyList()); | ||
| assertFalse("Compaction should not be executed in readonly mode", | ||
| tracker.wasCompactionExecuted()); | ||
| } catch (Exception e) { | ||
| throw new RuntimeException(e); | ||
| } finally { | ||
| setReadOnlyMode(false); | ||
| } | ||
| } | ||
|
|
||
| @Test | ||
| public void testReplaceExecutedWhenWritable() throws Exception { | ||
| tracker = new DummyStoreFileTrackerForReadOnlyMode(conf, true); | ||
| tracker.replace(Collections.emptyList(), Collections.emptyList()); | ||
| assertTrue("Compaction should run when not readonly", tracker.wasCompactionExecuted()); | ||
| } | ||
| } |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can we add same check to the
addandsetmethod? It would give an extra safeguard just in case these methods are inadvertently called on read-replica.Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@wchevreuil We haven't added any prevention mechanism which will avoid calls to
addandsetfunction in read-only mode, so are you suggesting to add it to these methods?Without these unit tests will always fails, as here I am deliberately calling them in test function.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If you want to clone the behavior of secondary replicas for the read-only mode, which makes perfect sense to me, I think you should follow it everywhere in this class. In addition to add(), set() and replace() methods, you might want to add the same safeguard to
createWriter()method as well. Could be also useful to extract the check in a separate method to reduce code duplication.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@anmolnar @wchevreuil
Added code changes as suggested. Please review.
I do see there are two more functions
createReferenceandremoveStoreFiles, do you think we should safeguard these functions too? I don't see these functions safeguarded for secondary replicas.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
In which case we probably don't need to.