This repository has been archived by the owner on Nov 14, 2024. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 15
Filter out leaderPaxos from list of namespaces #4760
Merged
Merged
Changes from 10 commits
Commits
Show all changes
11 commits
Select commit
Hold shift + click to select a range
b858721
Filter out leaderPaxos from list of namespaces
sudiksha27 7ed3014
Add generated changelog entries
sudiksha27 0ff0279
Fix imports
sudiksha27 6485433
Add generated changelog entries
sudiksha27 fda8c53
Tests
sudiksha27 8b6b799
Merge branch 'namespace_loader_bug_fix' of github.com:palantir/atlasd…
sudiksha27 27f69c9
Merge branch 'develop' into namespace_loader_bug_fix
sudiksha27 c32c77f
Resolve conflict
sudiksha27 7ac199d
Modify test
sudiksha27 dbe680e
Address comments -1
sudiksha27 7163e6b
Address comments - 2
sudiksha27 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 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,6 @@ | ||
type: fix | ||
fix: | ||
description: '`leaderPaxos` will not be returned as a namespace. Previously, `leaderPaxos` | ||
was incorrectly considered as a namespace.' | ||
links: | ||
- https://github.com/palantir/atlasdb/pull/4760 |
This file contains 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
71 changes: 71 additions & 0 deletions
71
...-impl/src/test/java/com/palantir/atlasdb/timelock/management/DiskNamespaceLoaderTest.java
This file contains 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,71 @@ | ||||||||
/* | ||||||||
* (c) Copyright 2020 Palantir Technologies Inc. All rights reserved. | ||||||||
* | ||||||||
* Licensed 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 com.palantir.atlasdb.timelock.management; | ||||||||
|
||||||||
import static org.assertj.core.api.Assertions.assertThat; | ||||||||
|
||||||||
import java.nio.file.Paths; | ||||||||
import java.util.Set; | ||||||||
import java.util.stream.Collectors; | ||||||||
|
||||||||
import org.junit.Before; | ||||||||
import org.junit.Rule; | ||||||||
import org.junit.Test; | ||||||||
import org.junit.rules.TemporaryFolder; | ||||||||
|
||||||||
import com.palantir.atlasdb.timelock.paxos.PaxosTimeLockConstants; | ||||||||
|
||||||||
public class DiskNamespaceLoaderTest { | ||||||||
private static final String NAMESPACE_1 = "namespace_1"; | ||||||||
private static final String NAMESPACE_2 = "namespace_2"; | ||||||||
|
||||||||
|
||||||||
public final @Rule TemporaryFolder tempFolder = new TemporaryFolder(); | ||||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
This is fine also, just for consistency with the other tests. |
||||||||
|
||||||||
public DiskNamespaceLoader diskNamespaceLoader; | ||||||||
|
||||||||
@Before | ||||||||
public void setup() { | ||||||||
diskNamespaceLoader = new DiskNamespaceLoader(tempFolder.getRoot().toPath()); | ||||||||
createDirectoryForLeaderForEachClientUseCase(NAMESPACE_1); | ||||||||
createDirectoryInRootDataDirectory(NAMESPACE_2); | ||||||||
} | ||||||||
|
||||||||
@Test | ||||||||
public void doesNotLoadLeaderPaxosAsNamespace() { | ||||||||
Set<String> namespaces = diskNamespaceLoader.getAllPersistedNamespaces().stream().map(client -> client.value()).collect( | ||||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. nit: Let's use a method reference here ( |
||||||||
Collectors.toSet()); | ||||||||
assertThat(namespaces).containsExactlyInAnyOrder(NAMESPACE_1, NAMESPACE_2); | ||||||||
} | ||||||||
|
||||||||
private void createDirectoryForLeaderForEachClientUseCase(String namespace) { | ||||||||
if (Paths.get(tempFolder.getRoot().toPath().toString(), | ||||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. nit: I think it's probably nicer to do |
||||||||
PaxosTimeLockConstants.LEADER_PAXOS_NAMESPACE, | ||||||||
PaxosTimeLockConstants.MULTI_LEADER_PAXOS_NAMESPACE, | ||||||||
namespace).toFile().mkdirs()) { | ||||||||
return; | ||||||||
} | ||||||||
throw new RuntimeException("Unexpected error when creating a subdirectory"); | ||||||||
} | ||||||||
|
||||||||
private void createDirectoryInRootDataDirectory(String namespace) { | ||||||||
if (Paths.get(tempFolder.getRoot().toPath().toString(), namespace).toFile().mkdirs()) { | ||||||||
return; | ||||||||
} | ||||||||
throw new RuntimeException("Unexpected error when creating a subdirectory"); | ||||||||
} | ||||||||
} |
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.
nit: 2 lines?