Skip to content

Remove unneeded VisibleForTesting TabletServer stuff #2576

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.

Sign up for GitHub

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
ctubbsii merged 1 commit into from
Mar 17, 2022
Merged

Remove unneeded VisibleForTesting TabletServer stuff #2576

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 8 additions & 22 deletions server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicLong;
import java.util.concurrent.locks.ReentrantLock;
import java.util.function.Consumer;

import org.apache.accumulo.core.Constants;
import org.apache.accumulo.core.client.Durability;
Expand Down Expand Up @@ -438,10 +439,10 @@ public void run() {
sleepUninterruptibly(getConfiguration().getTimeInMillis(Property.TSERV_MAJC_DELAY),
TimeUnit.MILLISECONDS);

List<DfsLogger> closedCopy;
final List<DfsLogger> closedCopy;

synchronized (closedLogs) {
closedCopy = copyClosedLogs(closedLogs);
closedCopy = List.copyOf(closedLogs);
}

// bail early now if we're shutting down
Expand Down Expand Up @@ -1241,12 +1242,7 @@ public SecurityOperation getSecurityOperation() {
// is used because its very import to know the order in which WALs were closed when deciding if a
// WAL is eligible for removal. Maintaining the order that logs were used in is currently a simple
// task because there is only one active log at a time.
LinkedHashSet<DfsLogger> closedLogs = new LinkedHashSet<>();

@VisibleForTesting
interface ReferencedRemover {
void removeInUse(Set<DfsLogger> candidates);
}
final LinkedHashSet<DfsLogger> closedLogs = new LinkedHashSet<>();

/**
* For a closed WAL to be eligible for removal it must be unreferenced AND all closed WALs older
Expand All @@ -1255,10 +1251,10 @@ interface ReferencedRemover {
*/
@VisibleForTesting
static Set<DfsLogger> findOldestUnreferencedWals(List<DfsLogger> closedLogs,
ReferencedRemover referencedRemover) {
Consumer<Set<DfsLogger>> referencedRemover) {
LinkedHashSet<DfsLogger> unreferenced = new LinkedHashSet<>(closedLogs);

referencedRemover.removeInUse(unreferenced);
referencedRemover.accept(unreferenced);

Iterator<DfsLogger> closedIter = closedLogs.iterator();
Iterator<DfsLogger> unrefIter = unreferenced.iterator();
Expand All @@ -1279,25 +1275,15 @@ static Set<DfsLogger> findOldestUnreferencedWals(List<DfsLogger> closedLogs,
return eligible;
}

@VisibleForTesting
static List<DfsLogger> copyClosedLogs(LinkedHashSet<DfsLogger> closedLogs) {
List<DfsLogger> closedCopy = new ArrayList<>(closedLogs.size());
for (DfsLogger dfsLogger : closedLogs) {
// very important this copy maintains same order ..
closedCopy.add(dfsLogger);
}
return Collections.unmodifiableList(closedCopy);
}

private void markUnusedWALs() {

List<DfsLogger> closedCopy;

synchronized (closedLogs) {
closedCopy = copyClosedLogs(closedLogs);
closedCopy = List.copyOf(closedLogs);
}

ReferencedRemover refRemover = candidates -> {
Consumer<Set<DfsLogger>> refRemover = candidates -> {
for (Tablet tablet : getOnlineTablets().values()) {
tablet.removeInUseLogs(candidates);
if (candidates.isEmpty()) {
Expand Down
19 changes: 2 additions & 17 deletions server/tserver/src/test/java/org/apache/accumulo/tserver/WalRemovalOrderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
import org.apache.accumulo.core.conf.AccumuloConfiguration;
import org.apache.accumulo.core.conf.DefaultConfiguration;
import org.apache.accumulo.server.fs.VolumeManager;
import org.apache.accumulo.tserver.TabletServer.ReferencedRemover;
import org.apache.accumulo.tserver.log.DfsLogger;
import org.apache.accumulo.tserver.log.DfsLogger.ServerResources;
import org.junit.jupiter.api.Test;
Expand Down Expand Up @@ -62,24 +61,10 @@ private static LinkedHashSet<DfsLogger> mockLoggers(String... logs) {
return logSet;
}

private static class TestRefRemover implements ReferencedRemover {
Set<DfsLogger> inUseLogs;

TestRefRemover(Set<DfsLogger> inUseLogs) {
this.inUseLogs = inUseLogs;
}

@Override
public void removeInUse(Set<DfsLogger> candidates) {
candidates.removeAll(inUseLogs);
}
}

private static void runTest(LinkedHashSet<DfsLogger> closedLogs, Set<DfsLogger> inUseLogs,
Set<DfsLogger> expected) {
List<DfsLogger> copy = TabletServer.copyClosedLogs(closedLogs);
Set<DfsLogger> eligible =
TabletServer.findOldestUnreferencedWals(copy, new TestRefRemover(inUseLogs));
Set<DfsLogger> eligible = TabletServer.findOldestUnreferencedWals(List.copyOf(closedLogs),
candidates -> candidates.removeAll(inUseLogs));
assertEquals(expected, eligible);
}

Expand Down