RATIS-1677. Do not auto format RaftStorage in RECOVER.#718

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
szetszwo merged 3 commits into from
Aug 26, 2022
Merged

RATIS-1677. Do not auto format RaftStorage in RECOVER. #718

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
542eb08
RATIS-1677. Do not auto format RaftStorage in RECOVER.
szetszwo Aug 19, 2022
252fa19
Address review comments.
szetszwo Aug 24, 2022
8012c4e
Remove the vol from dirsPerVol.
szetszwo Aug 25, 2022
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
12 changes: 10 additions & 2 deletions ratis-client/src/main/java/org/apache/ratis/client/api/GroupManagementApi.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -29,8 +29,16 @@
* APIs to support group management operations such as add, remove, list and info to a particular server.
*/
public interface GroupManagementApi {
/** Add a new group. */
RaftClientReply add(RaftGroup newGroup) throws IOException;
/**
* Add a new group.
* @param format Should it format the storage?
*/
RaftClientReply add(RaftGroup newGroup, boolean format) throws IOException;

/** The same as add(newGroup, true). */
default RaftClientReply add(RaftGroup newGroup) throws IOException {
return add(newGroup, true);
}

/** Remove a group. */
RaftClientReply remove(RaftGroupId groupId, boolean deleteDirectory, boolean renameDirectory) throws IOException;
Expand Down
9 changes: 6 additions & 3 deletions ratis-client/src/main/java/org/apache/ratis/client/impl/ClientProtoUtils.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -571,8 +571,9 @@ static GroupManagementRequest toGroupManagementRequest(GroupManagementRequestPro
final RaftPeerId serverId = RaftPeerId.valueOf(m.getReplyId());
switch(p.getOpCase()) {
case GROUPADD:
final GroupAddRequestProto add = p.getGroupAdd();
return GroupManagementRequest.newAdd(clientId, serverId, m.getCallId(),
ProtoUtils.toRaftGroup(p.getGroupAdd().getGroup()));
ProtoUtils.toRaftGroup(add.getGroup()), add.getFormat());
case GROUPREMOVE:
final GroupRemoveRequestProto remove = p.getGroupRemove();
return GroupManagementRequest.newRemove(clientId, serverId, m.getCallId(),
Expand DownExpand Up@@ -609,8 +610,10 @@ static GroupManagementRequestProto toGroupManagementRequestProto(GroupManagement
.setRpcRequest(toRaftRpcRequestProtoBuilder(request));
final GroupManagementRequest.Add add = request.getAdd();
if (add != null) {
b.setGroupAdd(GroupAddRequestProto.newBuilder().setGroup(
ProtoUtils.toRaftGroupProtoBuilder(add.getGroup())).build());
b.setGroupAdd(GroupAddRequestProto.newBuilder()
.setGroup(ProtoUtils.toRaftGroupProtoBuilder(add.getGroup()))
.setFormat(add.isFormat())
.build());
}
final GroupManagementRequest.Remove remove = request.getRemove();
if (remove != null) {
Expand Down
4 changes: 2 additions & 2 deletions ratis-client/src/main/java/org/apache/ratis/client/impl/GroupManagementImpl.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -43,13 +43,13 @@ class GroupManagementImpl implements GroupManagementApi {
}

@Override
public RaftClientReply add(RaftGroup newGroup) throws IOException {
public RaftClientReply add(RaftGroup newGroup, boolean format) throws IOException {
Objects.requireNonNull(newGroup, "newGroup == null");

final long callId = CallId.getAndIncrement();
client.getClientRpc().addRaftPeers(newGroup.getPeers());
return client.io().sendRequestWithRetry(
() -> GroupManagementRequest.newAdd(client.getId(), server, callId, newGroup));
() -> GroupManagementRequest.newAdd(client.getId(), server, callId, newGroup, format));
}

@Override
Expand Down
13 changes: 10 additions & 3 deletions ratis-common/src/main/java/org/apache/ratis/protocol/GroupManagementRequest.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,9 +26,11 @@ public abstract static class Op {

public static class Add extends Op {
private final RaftGroup group;
private final boolean format;

public Add(RaftGroup group) {
public Add(RaftGroup group, boolean format) {
this.group = group;
this.format = format;
}

@Override
Expand All@@ -40,6 +42,10 @@ public RaftGroup getGroup() {
return group;
}

public boolean isFormat() {
return format;
}

@Override
public String toString() {
return JavaUtils.getClassSimpleName(getClass()) + ":" + getGroup();
Expand DownExpand Up@@ -79,8 +85,9 @@ public String toString() {
}
}

public static GroupManagementRequest newAdd(ClientId clientId, RaftPeerId serverId, long callId, RaftGroup group) {
return new GroupManagementRequest(clientId, serverId, callId, new Add(group));
public static GroupManagementRequest newAdd(ClientId clientId, RaftPeerId serverId, long callId,
RaftGroup group, boolean format) {
return new GroupManagementRequest(clientId, serverId, callId, new Add(group, format));
}

public static GroupManagementRequest newRemove(ClientId clientId, RaftPeerId serverId, long callId,
Expand Down
90 changes: 90 additions & 0 deletions ratis-common/src/main/java/org/apache/ratis/util/MemoizedCheckedSupplier.java
View file
Open in desktop
Original file line numberDiff line numberDiff 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.ratis.util;

import org.apache.ratis.util.function.CheckedSupplier;

import java.util.Objects;

/**
* A memoized supplier is a {@link CheckedSupplier}
* which gets a value by invoking its initializer once.
* and then keeps returning the same value as its supplied results.
*
* This class is thread safe.
*
* @param <RETURN> The return type of the supplier.
* @param <THROW> The throwable type of the supplier.
*/
public final class MemoizedCheckedSupplier<RETURN, THROW extends Throwable>
implements CheckedSupplier<RETURN, THROW> {
/**
* @param supplier to supply at most one non-null value.
* @return a {@link MemoizedCheckedSupplier} with the given supplier.
*/
public static <RETURN, THROW extends Throwable> MemoizedCheckedSupplier<RETURN, THROW> valueOf(
CheckedSupplier<RETURN, THROW> supplier) {
return supplier instanceof MemoizedCheckedSupplier ?
(MemoizedCheckedSupplier<RETURN, THROW>) supplier : new MemoizedCheckedSupplier<>(supplier);
}

private final CheckedSupplier<RETURN, THROW> initializer;
private volatile RETURN value = null;

/**
* Create a memoized supplier.
* @param initializer to supply at most one non-null value.
*/
private MemoizedCheckedSupplier(CheckedSupplier<RETURN, THROW> initializer) {
Objects.requireNonNull(initializer, "initializer == null");
this.initializer = initializer;
}

/** @return the lazily initialized object. */
@Override
public RETURN get() throws THROW {
RETURN v = value;
if (v == null) {
synchronized (this) {
v = value;
if (v == null) {
v = value = Objects.requireNonNull(initializer.get(), "initializer.get() returns null");
}
}
}
return v;
}

/**
* @return the already initialized object.
* @throws NullPointerException if the object is uninitialized.
*/
public RETURN getUnchecked() {
return Objects.requireNonNull(value, "value == null");
}

/** @return is the object initialized? */
public boolean isInitialized() {
return value != null;
}

@Override
public String toString() {
return isInitialized()? "Memoized:" + value: "UNINITIALIZED";
}
}
5 changes: 5 additions & 0 deletions ratis-common/src/main/java/org/apache/ratis/util/Preconditions.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,7 @@

import java.util.Collections;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
import java.util.function.Supplier;

Expand DownExpand Up@@ -113,6 +114,10 @@ static <T> T assertInstanceOf(Object object, Class<T> clazz) {
return clazz.cast(object);
}

static <K, V> void assertEmpty(Map<K, V> map, Object name) {
assertTrue(map.isEmpty(), () -> "The " + name + " map is non-empty: " + map);
}

static <T> void assertUnique(Iterable<T> first) {
assertUnique(first, Collections.emptyList());
}
Expand Down
1 change: 1 addition & 0 deletions ratis-common/src/main/java/org/apache/ratis/util/SizeInBytes.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,7 @@
* Size which may be constructed with a {@link TraditionalBinaryPrefix}.
*/
public final class SizeInBytes {
public static final SizeInBytes ZERO = valueOf(0);
public static final SizeInBytes ONE_KB = valueOf("1k");
public static final SizeInBytes ONE_MB = valueOf("1m");

Expand Down
1 change: 1 addition & 0 deletions ratis-proto/src/main/proto/Raft.proto
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -469,6 +469,7 @@ message StartLeaderElectionReplyProto {
// A request to add a new group
message GroupAddRequestProto {
RaftGroupProto group = 1; // the group to be added.
bool format = 2; // Should it format the storage?
}

message GroupRemoveRequestProto {
Expand Down
16 changes: 12 additions & 4 deletions ratis-server-api/src/main/java/org/apache/ratis/server/RaftServer.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -167,8 +167,8 @@ class Builder {

private static Method initNewRaftServerMethod() {
final String className = RaftServer.class.getPackage().getName() + ".impl.ServerImplUtils";
final Class<?>[] argClasses = {RaftPeerId.class, RaftGroup.class, StateMachine.Registry.class,
RaftProperties.class, Parameters.class};
final Class<?>[] argClasses = {RaftPeerId.class, RaftGroup.class, RaftStorage.StartupOption.class,
StateMachine.Registry.class, RaftProperties.class, Parameters.class};
try {
final Class<?> clazz = ReflectionUtils.getClassByName(className);
return clazz.getMethod("newRaftServer", argClasses);
Expand All@@ -177,12 +177,12 @@ private static Method initNewRaftServerMethod() {
}
}

private static RaftServer newRaftServer(RaftPeerId serverId, RaftGroup group,
private static RaftServer newRaftServer(RaftPeerId serverId, RaftGroup group, RaftStorage.StartupOption option,
StateMachine.Registry stateMachineRegistry, RaftProperties properties, Parameters parameters)
throws IOException {
try {
return (RaftServer) NEW_RAFT_SERVER_METHOD.invoke(null,
serverId, group, stateMachineRegistry, properties, parameters);
serverId, group, option, stateMachineRegistry, properties, parameters);
} catch (IllegalAccessException e) {
throw new IllegalStateException("Failed to build " + serverId, e);
} catch (InvocationTargetException e) {
Expand All@@ -193,6 +193,7 @@ private static RaftServer newRaftServer(RaftPeerId serverId, RaftGroup group,
private RaftPeerId serverId;
private StateMachine.Registry stateMachineRegistry ;
private RaftGroup group = null;
private RaftStorage.StartupOption option = RaftStorage.StartupOption.RECOVER;
private RaftProperties properties;
private Parameters parameters;

Expand All@@ -201,6 +202,7 @@ public RaftServer build() throws IOException {
return newRaftServer(
serverId,
group,
option,
Objects.requireNonNull(stateMachineRegistry , "Neither 'stateMachine' nor 'setStateMachineRegistry' " +
"is initialized."),
Objects.requireNonNull(properties, "The 'properties' field is not initialized."),
Expand DownExpand Up@@ -230,6 +232,12 @@ public Builder setGroup(RaftGroup group) {
return this;
}

/** Set the startup option for the group. */
public Builder setOption(RaftStorage.StartupOption option) {
this.option = option;
return this;
}

/** Set {@link RaftProperties}. */
public Builder setProperties(RaftProperties properties) {
this.properties = properties;
Expand Down
5 changes: 2 additions & 3 deletions ratis-server-api/src/main/java/org/apache/ratis/server/storage/RaftStorage.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -62,8 +62,7 @@ class Builder {

private static Method initNewRaftStorageMethod() {
final String className = RaftStorage.class.getPackage().getName() + ".StorageImplUtils";
//final String className = "org.apache.ratis.server.storage.RaftStorageImpl";
final Class<?>[] argClasses = { File.class, CorruptionPolicy.class, StartupOption.class, long.class };
final Class<?>[] argClasses = {File.class, SizeInBytes.class, StartupOption.class, CorruptionPolicy.class};
try {
final Class<?> clazz = ReflectionUtils.getClassByName(className);
return clazz.getMethod("newRaftStorage", argClasses);
Expand All@@ -76,7 +75,7 @@ private static RaftStorage newRaftStorage(File dir, CorruptionPolicy logCorrupti
StartupOption option, SizeInBytes storageFreeSpaceMin) throws IOException {
try {
return (RaftStorage) NEW_RAFT_STORAGE_METHOD.invoke(null,
dir, logCorruptionPolicy, option, storageFreeSpaceMin.getSize());
dir, storageFreeSpaceMin, option, logCorruptionPolicy);
} catch (IllegalAccessException e) {
throw new IllegalStateException("Failed to build " + dir, e);
} catch (InvocationTargetException e) {
Expand Down
9 changes: 5 additions & 4 deletions ratis-server/src/main/java/org/apache/ratis/server/impl/RaftServerImpl.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -189,7 +189,8 @@ public long[] getFollowerNextIndices() {

private final AtomicBoolean firstElectionSinceStartup = new AtomicBoolean(true);

RaftServerImpl(RaftGroup group, StateMachine stateMachine, RaftServerProxy proxy) throws IOException {
RaftServerImpl(RaftGroup group, StateMachine stateMachine, RaftServerProxy proxy, RaftStorage.StartupOption option)
throws IOException {
final RaftPeerId id = proxy.getId();
LOG.info("{}: new RaftServerImpl for {} with {}", id, group, stateMachine);
this.lifeCycle = new LifeCycle(id);
Expand All@@ -202,7 +203,7 @@ public long[] getFollowerNextIndices() {
this.sleepDeviationThreshold = RaftServerConfigKeys.sleepDeviationThreshold(properties);
this.proxy = proxy;

this.state = new ServerState(id, group, properties, this, stateMachine);
this.state = new ServerState(id, group, stateMachine, this, option, properties);
this.retryCache = new RetryCacheImpl(properties);
this.dataStreamMap = new DataStreamMapImpl(id);

Expand DownExpand Up@@ -575,8 +576,8 @@ public Collection<CommitInfoProto> getCommitInfos() {
}

GroupInfoReply getGroupInfo(GroupInfoRequest request) {
return new GroupInfoReply(request, getCommitInfos(),
getGroup(), getRoleInfoProto(), state.getStorage().getStorageDir().isHealthy());
final RaftStorageDirectory dir = state.getStorage().getStorageDir();
return new GroupInfoReply(request, getCommitInfos(), getGroup(), getRoleInfoProto(), dir.isHealthy());
}

RoleInfoProto getRoleInfoProto() {
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
RATIS-1677. Do not auto format RaftStorage in RECOVER.#718

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

szetszwo
merged 3 commits into

from

Aug 26, 2022
 Merged


RATIS-1677. Do not auto format RaftStorage in RECOVER.
#718
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
542eb08

RATIS-1677. Do not auto format RaftStorage in RECOVER.


szetszwo Aug 19, 2022
252fa19

Address review comments.


szetszwo Aug 24, 2022
8012c4e

Remove the vol from dirsPerVol.


szetszwo Aug 25, 2022

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


12 changes: 10 additions & 2 deletions
ratis-client/src/main/java/org/apache/ratis/client/api/GroupManagementApi.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,8 +29,16 @@
 * APIs to support group management operations such as add, remove, list and info to a particular server.
 */
public interface GroupManagementApi {
 /** Add a new group. */
 RaftClientReply add(RaftGroup newGroup) throws IOException;
 /**
 * Add a new group.
 * @param format Should it format the storage?
 */
 RaftClientReply add(RaftGroup newGroup, boolean format) throws IOException;

 /** The same as add(newGroup, true). */
 default RaftClientReply add(RaftGroup newGroup) throws IOException {
 return add(newGroup, true);
 }

 /** Remove a group. */
 RaftClientReply remove(RaftGroupId groupId, boolean deleteDirectory, boolean renameDirectory) throws IOException;
Expand Down

9 changes: 6 additions & 3 deletions
ratis-client/src/main/java/org/apache/ratis/client/impl/ClientProtoUtils.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -571,8 +571,9 @@ static GroupManagementRequest toGroupManagementRequest(GroupManagementRequestPro
 final RaftPeerId serverId = RaftPeerId.valueOf(m.getReplyId());
 switch(p.getOpCase()) {
 case GROUPADD:
 final GroupAddRequestProto add = p.getGroupAdd();
 return GroupManagementRequest.newAdd(clientId, serverId, m.getCallId(),
 ProtoUtils.toRaftGroup(p.getGroupAdd().getGroup()));
 ProtoUtils.toRaftGroup(add.getGroup()), add.getFormat());
 case GROUPREMOVE:
 final GroupRemoveRequestProto remove = p.getGroupRemove();
 return GroupManagementRequest.newRemove(clientId, serverId, m.getCallId(),
Expand DownExpand Up@@ -609,8 +610,10 @@ static GroupManagementRequestProto toGroupManagementRequestProto(GroupManagement
 .setRpcRequest(toRaftRpcRequestProtoBuilder(request));
 final GroupManagementRequest.Add add = request.getAdd();
 if (add != null) {
 b.setGroupAdd(GroupAddRequestProto.newBuilder().setGroup(
 ProtoUtils.toRaftGroupProtoBuilder(add.getGroup())).build());
 b.setGroupAdd(GroupAddRequestProto.newBuilder()
 .setGroup(ProtoUtils.toRaftGroupProtoBuilder(add.getGroup()))
 .setFormat(add.isFormat())
 .build());
 }
 final GroupManagementRequest.Remove remove = request.getRemove();
 if (remove != null) {
Expand Down

4 changes: 2 additions & 2 deletions
ratis-client/src/main/java/org/apache/ratis/client/impl/GroupManagementImpl.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -43,13 +43,13 @@ class GroupManagementImpl implements GroupManagementApi {
 }

 @Override
 public RaftClientReply add(RaftGroup newGroup) throws IOException {
 public RaftClientReply add(RaftGroup newGroup, boolean format) throws IOException {
 Objects.requireNonNull(newGroup, "newGroup == null");

 final long callId = CallId.getAndIncrement();
 client.getClientRpc().addRaftPeers(newGroup.getPeers());
 return client.io().sendRequestWithRetry(
 () -> GroupManagementRequest.newAdd(client.getId(), server, callId, newGroup));
 () -> GroupManagementRequest.newAdd(client.getId(), server, callId, newGroup, format));
 }

 @Override
Expand Down

13 changes: 10 additions & 3 deletions
ratis-common/src/main/java/org/apache/ratis/protocol/GroupManagementRequest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,9 +26,11 @@ public abstract static class Op {

 public static class Add extends Op {
 private final RaftGroup group;
 private final boolean format;

 public Add(RaftGroup group) {
 public Add(RaftGroup group, boolean format) {
 this.group = group;
 this.format = format;
 }

 @Override
Expand All@@ -40,6 +42,10 @@ public RaftGroup getGroup() {
 return group;
 }

 public boolean isFormat() {
 return format;
 }

 @Override
 public String toString() {
 return JavaUtils.getClassSimpleName(getClass()) + ":" + getGroup();
Expand DownExpand Up@@ -79,8 +85,9 @@ public String toString() {
 }
 }

 public static GroupManagementRequest newAdd(ClientId clientId, RaftPeerId serverId, long callId, RaftGroup group) {
 return new GroupManagementRequest(clientId, serverId, callId, new Add(group));
 public static GroupManagementRequest newAdd(ClientId clientId, RaftPeerId serverId, long callId,
 RaftGroup group, boolean format) {
 return new GroupManagementRequest(clientId, serverId, callId, new Add(group, format));
 }

 public static GroupManagementRequest newRemove(ClientId clientId, RaftPeerId serverId, long callId,
Expand Down

90 changes: 90 additions & 0 deletions
ratis-common/src/main/java/org/apache/ratis/util/MemoizedCheckedSupplier.java

View file


Open in desktop

Original file line numberDiff line numberDiff 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.ratis.util;

import org.apache.ratis.util.function.CheckedSupplier;

import java.util.Objects;

/**
 * A memoized supplier is a {@link CheckedSupplier}
 * which gets a value by invoking its initializer once.
 * and then keeps returning the same value as its supplied results.
 *
 * This class is thread safe.
 *
 * @param <RETURN> The return type of the supplier.
 * @param <THROW> The throwable type of the supplier.
 */
public final class MemoizedCheckedSupplier<RETURN, THROW extends Throwable>
 implements CheckedSupplier<RETURN, THROW> {
 /**
 * @param supplier to supply at most one non-null value.
 * @return a {@link MemoizedCheckedSupplier} with the given supplier.
 */
 public static <RETURN, THROW extends Throwable> MemoizedCheckedSupplier<RETURN, THROW> valueOf(
 CheckedSupplier<RETURN, THROW> supplier) {
 return supplier instanceof MemoizedCheckedSupplier ?
 (MemoizedCheckedSupplier<RETURN, THROW>) supplier : new MemoizedCheckedSupplier<>(supplier);
 }

 private final CheckedSupplier<RETURN, THROW> initializer;
 private volatile RETURN value = null;

 /**
 * Create a memoized supplier.
 * @param initializer to supply at most one non-null value.
 */
 private MemoizedCheckedSupplier(CheckedSupplier<RETURN, THROW> initializer) {
 Objects.requireNonNull(initializer, "initializer == null");
 this.initializer = initializer;
 }

 /** @return the lazily initialized object. */
 @Override
 public RETURN get() throws THROW {
 RETURN v = value;
 if (v == null) {
 synchronized (this) {
 v = value;
 if (v == null) {
 v = value = Objects.requireNonNull(initializer.get(), "initializer.get() returns null");
 }
 }
 }
 return v;
 }

 /**
 * @return the already initialized object.
 * @throws NullPointerException if the object is uninitialized.
 */
 public RETURN getUnchecked() {
 return Objects.requireNonNull(value, "value == null");
 }

 /** @return is the object initialized? */
 public boolean isInitialized() {
 return value != null;
 }

 @Override
 public String toString() {
 return isInitialized()? "Memoized:" + value: "UNINITIALIZED";
 }
}

5 changes: 5 additions & 0 deletions
ratis-common/src/main/java/org/apache/ratis/util/Preconditions.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,7 @@

import java.util.Collections;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
import java.util.function.Supplier;

Expand DownExpand Up@@ -113,6 +114,10 @@ static <T> T assertInstanceOf(Object object, Class<T> clazz) {
 return clazz.cast(object);
 }

 static <K, V> void assertEmpty(Map<K, V> map, Object name) {
 assertTrue(map.isEmpty(), () -> "The " + name + " map is non-empty: " + map);
 }

 static <T> void assertUnique(Iterable<T> first) {
 assertUnique(first, Collections.emptyList());
 }
Expand Down

1 change: 1 addition & 0 deletions
ratis-common/src/main/java/org/apache/ratis/util/SizeInBytes.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,7 @@
 * Size which may be constructed with a {@link TraditionalBinaryPrefix}.
 */
public final class SizeInBytes {
 public static final SizeInBytes ZERO = valueOf(0);
 public static final SizeInBytes ONE_KB = valueOf("1k");
 public static final SizeInBytes ONE_MB = valueOf("1m");

Expand Down

1 change: 1 addition & 0 deletions
ratis-proto/src/main/proto/Raft.proto

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -469,6 +469,7 @@ message StartLeaderElectionReplyProto {
// A request to add a new group
message GroupAddRequestProto {
 RaftGroupProto group = 1; // the group to be added.
 bool format = 2; // Should it format the storage?
}

message GroupRemoveRequestProto {
Expand Down

16 changes: 12 additions & 4 deletions
ratis-server-api/src/main/java/org/apache/ratis/server/RaftServer.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -167,8 +167,8 @@ class Builder {

 private static Method initNewRaftServerMethod() {
 final String className = RaftServer.class.getPackage().getName() + ".impl.ServerImplUtils";
 final Class<?>[] argClasses = {RaftPeerId.class, RaftGroup.class, StateMachine.Registry.class,
 RaftProperties.class, Parameters.class};
 final Class<?>[] argClasses = {RaftPeerId.class, RaftGroup.class, RaftStorage.StartupOption.class,
StateMachine.Registry.class, RaftProperties.class, Parameters.class};
 try {
 final Class<?> clazz = ReflectionUtils.getClassByName(className);
 return clazz.getMethod("newRaftServer", argClasses);
Expand All@@ -177,12 +177,12 @@ private static Method initNewRaftServerMethod() {
 }
 }

 private static RaftServer newRaftServer(RaftPeerId serverId, RaftGroup group,
 private static RaftServer newRaftServer(RaftPeerId serverId, RaftGroup group, RaftStorage.StartupOption option,
 StateMachine.Registry stateMachineRegistry, RaftProperties properties, Parameters parameters)
 throws IOException {
 try {
 return (RaftServer) NEW_RAFT_SERVER_METHOD.invoke(null,
 serverId, group, stateMachineRegistry, properties, parameters);
 serverId, group, option, stateMachineRegistry, properties, parameters);
 } catch (IllegalAccessException e) {
 throw new IllegalStateException("Failed to build " + serverId, e);
 } catch (InvocationTargetException e) {
Expand All@@ -193,6 +193,7 @@ private static RaftServer newRaftServer(RaftPeerId serverId, RaftGroup group,
 private RaftPeerId serverId;
 private StateMachine.Registry stateMachineRegistry ;
 private RaftGroup group = null;
 private RaftStorage.StartupOption option = RaftStorage.StartupOption.RECOVER;
 private RaftProperties properties;
 private Parameters parameters;

Expand All@@ -201,6 +202,7 @@ public RaftServer build() throws IOException {
 return newRaftServer(
 serverId,
 group,
 option,
 Objects.requireNonNull(stateMachineRegistry , "Neither 'stateMachine' nor 'setStateMachineRegistry' " +
 "is initialized."),
 Objects.requireNonNull(properties, "The 'properties' field is not initialized."),
Expand DownExpand Up@@ -230,6 +232,12 @@ public Builder setGroup(RaftGroup group) {
 return this;
 }

 /** Set the startup option for the group. */
 public Builder setOption(RaftStorage.StartupOption option) {
 this.option = option;
 return this;
 }

 /** Set {@link RaftProperties}. */
 public Builder setProperties(RaftProperties properties) {
 this.properties = properties;
Expand Down

5 changes: 2 additions & 3 deletions
ratis-server-api/src/main/java/org/apache/ratis/server/storage/RaftStorage.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -62,8 +62,7 @@ class Builder {

 private static Method initNewRaftStorageMethod() {
 final String className = RaftStorage.class.getPackage().getName() + ".StorageImplUtils";
 //final String className = "org.apache.ratis.server.storage.RaftStorageImpl";
 final Class<?>[] argClasses = { File.class, CorruptionPolicy.class, StartupOption.class, long.class };
 final Class<?>[] argClasses = {File.class, SizeInBytes.class, StartupOption.class, CorruptionPolicy.class};
 try {
 final Class<?> clazz = ReflectionUtils.getClassByName(className);
 return clazz.getMethod("newRaftStorage", argClasses);
Expand All@@ -76,7 +75,7 @@ private static RaftStorage newRaftStorage(File dir, CorruptionPolicy logCorrupti
 StartupOption option, SizeInBytes storageFreeSpaceMin) throws IOException {
 try {
 return (RaftStorage) NEW_RAFT_STORAGE_METHOD.invoke(null,
 dir, logCorruptionPolicy, option, storageFreeSpaceMin.getSize());
 dir, storageFreeSpaceMin, option, logCorruptionPolicy);
 } catch (IllegalAccessException e) {
 throw new IllegalStateException("Failed to build " + dir, e);
 } catch (InvocationTargetException e) {
Expand Down

9 changes: 5 additions & 4 deletions
ratis-server/src/main/java/org/apache/ratis/server/impl/RaftServerImpl.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -189,7 +189,8 @@ public long[] getFollowerNextIndices() {

 private final AtomicBoolean firstElectionSinceStartup = new AtomicBoolean(true);

 RaftServerImpl(RaftGroup group, StateMachine stateMachine, RaftServerProxy proxy) throws IOException {
 RaftServerImpl(RaftGroup group, StateMachine stateMachine, RaftServerProxy proxy, RaftStorage.StartupOption option)
 throws IOException {
 final RaftPeerId id = proxy.getId();
 LOG.info("{}: new RaftServerImpl for {} with {}", id, group, stateMachine);
 this.lifeCycle = new LifeCycle(id);
Expand All@@ -202,7 +203,7 @@ public long[] getFollowerNextIndices() {
 this.sleepDeviationThreshold = RaftServerConfigKeys.sleepDeviationThreshold(properties);
 this.proxy = proxy;

 this.state = new ServerState(id, group, properties, this, stateMachine);
 this.state = new ServerState(id, group, stateMachine, this, option, properties);
 this.retryCache = new RetryCacheImpl(properties);
 this.dataStreamMap = new DataStreamMapImpl(id);

Expand DownExpand Up@@ -575,8 +576,8 @@ public Collection<CommitInfoProto> getCommitInfos() {
 }

 GroupInfoReply getGroupInfo(GroupInfoRequest request) {
return new GroupInfoReply(request, getCommitInfos(),
 getGroup(), getRoleInfoProto(), state.getStorage().getStorageDir().isHealthy());
final RaftStorageDirectory dir = state.getStorage().getStorageDir();
return new GroupInfoReply(request, getCommitInfos(), getGroup(), getRoleInfoProto(), dir.isHealthy());
 }

 RoleInfoProto getRoleInfoProto() {
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
RATIS-1677. Do not auto format RaftStorage in RECOVER.#718

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

szetszwo
merged 3 commits into

from

Aug 26, 2022
 Merged


RATIS-1677. Do not auto format RaftStorage in RECOVER.
#718
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
542eb08

RATIS-1677. Do not auto format RaftStorage in RECOVER.


szetszwo Aug 19, 2022
252fa19

Address review comments.


szetszwo Aug 24, 2022
8012c4e

Remove the vol from dirsPerVol.


szetszwo Aug 25, 2022

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


12 changes: 10 additions & 2 deletions
ratis-client/src/main/java/org/apache/ratis/client/api/GroupManagementApi.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,8 +29,16 @@
 * APIs to support group management operations such as add, remove, list and info to a particular server.
 */
public interface GroupManagementApi {
 /** Add a new group. */
 RaftClientReply add(RaftGroup newGroup) throws IOException;
 /**
 * Add a new group.
 * @param format Should it format the storage?
 */
 RaftClientReply add(RaftGroup newGroup, boolean format) throws IOException;

 /** The same as add(newGroup, true). */
 default RaftClientReply add(RaftGroup newGroup) throws IOException {
 return add(newGroup, true);
 }

 /** Remove a group. */
 RaftClientReply remove(RaftGroupId groupId, boolean deleteDirectory, boolean renameDirectory) throws IOException;
Expand Down

9 changes: 6 additions & 3 deletions
ratis-client/src/main/java/org/apache/ratis/client/impl/ClientProtoUtils.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -571,8 +571,9 @@ static GroupManagementRequest toGroupManagementRequest(GroupManagementRequestPro
 final RaftPeerId serverId = RaftPeerId.valueOf(m.getReplyId());
 switch(p.getOpCase()) {
 case GROUPADD:
 final GroupAddRequestProto add = p.getGroupAdd();
 return GroupManagementRequest.newAdd(clientId, serverId, m.getCallId(),
 ProtoUtils.toRaftGroup(p.getGroupAdd().getGroup()));
 ProtoUtils.toRaftGroup(add.getGroup()), add.getFormat());
 case GROUPREMOVE:
 final GroupRemoveRequestProto remove = p.getGroupRemove();
 return GroupManagementRequest.newRemove(clientId, serverId, m.getCallId(),
Expand DownExpand Up@@ -609,8 +610,10 @@ static GroupManagementRequestProto toGroupManagementRequestProto(GroupManagement
 .setRpcRequest(toRaftRpcRequestProtoBuilder(request));
 final GroupManagementRequest.Add add = request.getAdd();
 if (add != null) {
 b.setGroupAdd(GroupAddRequestProto.newBuilder().setGroup(
 ProtoUtils.toRaftGroupProtoBuilder(add.getGroup())).build());
 b.setGroupAdd(GroupAddRequestProto.newBuilder()
 .setGroup(ProtoUtils.toRaftGroupProtoBuilder(add.getGroup()))
 .setFormat(add.isFormat())
 .build());
 }
 final GroupManagementRequest.Remove remove = request.getRemove();
 if (remove != null) {
Expand Down

4 changes: 2 additions & 2 deletions
ratis-client/src/main/java/org/apache/ratis/client/impl/GroupManagementImpl.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -43,13 +43,13 @@ class GroupManagementImpl implements GroupManagementApi {
 }

 @Override
 public RaftClientReply add(RaftGroup newGroup) throws IOException {
 public RaftClientReply add(RaftGroup newGroup, boolean format) throws IOException {
 Objects.requireNonNull(newGroup, "newGroup == null");

 final long callId = CallId.getAndIncrement();
 client.getClientRpc().addRaftPeers(newGroup.getPeers());
 return client.io().sendRequestWithRetry(
 () -> GroupManagementRequest.newAdd(client.getId(), server, callId, newGroup));
 () -> GroupManagementRequest.newAdd(client.getId(), server, callId, newGroup, format));
 }

 @Override
Expand Down

13 changes: 10 additions & 3 deletions
ratis-common/src/main/java/org/apache/ratis/protocol/GroupManagementRequest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,9 +26,11 @@ public abstract static class Op {

 public static class Add extends Op {
 private final RaftGroup group;
 private final boolean format;

 public Add(RaftGroup group) {
 public Add(RaftGroup group, boolean format) {
 this.group = group;
 this.format = format;
 }

 @Override
Expand All@@ -40,6 +42,10 @@ public RaftGroup getGroup() {
 return group;
 }

 public boolean isFormat() {
 return format;
 }

 @Override
 public String toString() {
 return JavaUtils.getClassSimpleName(getClass()) + ":" + getGroup();
Expand DownExpand Up@@ -79,8 +85,9 @@ public String toString() {
 }
 }

 public static GroupManagementRequest newAdd(ClientId clientId, RaftPeerId serverId, long callId, RaftGroup group) {
 return new GroupManagementRequest(clientId, serverId, callId, new Add(group));
 public static GroupManagementRequest newAdd(ClientId clientId, RaftPeerId serverId, long callId,
 RaftGroup group, boolean format) {
 return new GroupManagementRequest(clientId, serverId, callId, new Add(group, format));
 }

 public static GroupManagementRequest newRemove(ClientId clientId, RaftPeerId serverId, long callId,
Expand Down

90 changes: 90 additions & 0 deletions
ratis-common/src/main/java/org/apache/ratis/util/MemoizedCheckedSupplier.java

View file


Open in desktop

Original file line numberDiff line numberDiff 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.ratis.util;

import org.apache.ratis.util.function.CheckedSupplier;

import java.util.Objects;

/**
 * A memoized supplier is a {@link CheckedSupplier}
 * which gets a value by invoking its initializer once.
 * and then keeps returning the same value as its supplied results.
 *
 * This class is thread safe.
 *
 * @param <RETURN> The return type of the supplier.
 * @param <THROW> The throwable type of the supplier.
 */
public final class MemoizedCheckedSupplier<RETURN, THROW extends Throwable>
 implements CheckedSupplier<RETURN, THROW> {
 /**
 * @param supplier to supply at most one non-null value.
 * @return a {@link MemoizedCheckedSupplier} with the given supplier.
 */
 public static <RETURN, THROW extends Throwable> MemoizedCheckedSupplier<RETURN, THROW> valueOf(
 CheckedSupplier<RETURN, THROW> supplier) {
 return supplier instanceof MemoizedCheckedSupplier ?
 (MemoizedCheckedSupplier<RETURN, THROW>) supplier : new MemoizedCheckedSupplier<>(supplier);
 }

 private final CheckedSupplier<RETURN, THROW> initializer;
 private volatile RETURN value = null;

 /**
 * Create a memoized supplier.
 * @param initializer to supply at most one non-null value.
 */
 private MemoizedCheckedSupplier(CheckedSupplier<RETURN, THROW> initializer) {
 Objects.requireNonNull(initializer, "initializer == null");
 this.initializer = initializer;
 }

 /** @return the lazily initialized object. */
 @Override
 public RETURN get() throws THROW {
 RETURN v = value;
 if (v == null) {
 synchronized (this) {
 v = value;
 if (v == null) {
 v = value = Objects.requireNonNull(initializer.get(), "initializer.get() returns null");
 }
 }
 }
 return v;
 }

 /**
 * @return the already initialized object.
 * @throws NullPointerException if the object is uninitialized.
 */
 public RETURN getUnchecked() {
 return Objects.requireNonNull(value, "value == null");
 }

 /** @return is the object initialized? */
 public boolean isInitialized() {
 return value != null;
 }

 @Override
 public String toString() {
 return isInitialized()? "Memoized:" + value: "UNINITIALIZED";
 }
}

5 changes: 5 additions & 0 deletions
ratis-common/src/main/java/org/apache/ratis/util/Preconditions.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,7 @@

import java.util.Collections;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
import java.util.function.Supplier;

Expand DownExpand Up@@ -113,6 +114,10 @@ static <T> T assertInstanceOf(Object object, Class<T> clazz) {
 return clazz.cast(object);
 }

 static <K, V> void assertEmpty(Map<K, V> map, Object name) {
 assertTrue(map.isEmpty(), () -> "The " + name + " map is non-empty: " + map);
 }

 static <T> void assertUnique(Iterable<T> first) {
 assertUnique(first, Collections.emptyList());
 }
Expand Down

1 change: 1 addition & 0 deletions
ratis-common/src/main/java/org/apache/ratis/util/SizeInBytes.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,7 @@
 * Size which may be constructed with a {@link TraditionalBinaryPrefix}.
 */
public final class SizeInBytes {
 public static final SizeInBytes ZERO = valueOf(0);
 public static final SizeInBytes ONE_KB = valueOf("1k");
 public static final SizeInBytes ONE_MB = valueOf("1m");

Expand Down

1 change: 1 addition & 0 deletions
ratis-proto/src/main/proto/Raft.proto

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -469,6 +469,7 @@ message StartLeaderElectionReplyProto {
// A request to add a new group
message GroupAddRequestProto {
 RaftGroupProto group = 1; // the group to be added.
 bool format = 2; // Should it format the storage?
}

message GroupRemoveRequestProto {
Expand Down

16 changes: 12 additions & 4 deletions
ratis-server-api/src/main/java/org/apache/ratis/server/RaftServer.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -167,8 +167,8 @@ class Builder {

 private static Method initNewRaftServerMethod() {
 final String className = RaftServer.class.getPackage().getName() + ".impl.ServerImplUtils";
 final Class<?>[] argClasses = {RaftPeerId.class, RaftGroup.class, StateMachine.Registry.class,
 RaftProperties.class, Parameters.class};
 final Class<?>[] argClasses = {RaftPeerId.class, RaftGroup.class, RaftStorage.StartupOption.class,
StateMachine.Registry.class, RaftProperties.class, Parameters.class};
 try {
 final Class<?> clazz = ReflectionUtils.getClassByName(className);
 return clazz.getMethod("newRaftServer", argClasses);
Expand All@@ -177,12 +177,12 @@ private static Method initNewRaftServerMethod() {
 }
 }

 private static RaftServer newRaftServer(RaftPeerId serverId, RaftGroup group,
 private static RaftServer newRaftServer(RaftPeerId serverId, RaftGroup group, RaftStorage.StartupOption option,
 StateMachine.Registry stateMachineRegistry, RaftProperties properties, Parameters parameters)
 throws IOException {
 try {
 return (RaftServer) NEW_RAFT_SERVER_METHOD.invoke(null,
 serverId, group, stateMachineRegistry, properties, parameters);
 serverId, group, option, stateMachineRegistry, properties, parameters);
 } catch (IllegalAccessException e) {
 throw new IllegalStateException("Failed to build " + serverId, e);
 } catch (InvocationTargetException e) {
Expand All@@ -193,6 +193,7 @@ private static RaftServer newRaftServer(RaftPeerId serverId, RaftGroup group,
 private RaftPeerId serverId;
 private StateMachine.Registry stateMachineRegistry ;
 private RaftGroup group = null;
 private RaftStorage.StartupOption option = RaftStorage.StartupOption.RECOVER;
 private RaftProperties properties;
 private Parameters parameters;

Expand All@@ -201,6 +202,7 @@ public RaftServer build() throws IOException {
 return newRaftServer(
 serverId,
 group,
 option,
 Objects.requireNonNull(stateMachineRegistry , "Neither 'stateMachine' nor 'setStateMachineRegistry' " +
 "is initialized."),
 Objects.requireNonNull(properties, "The 'properties' field is not initialized."),
Expand DownExpand Up@@ -230,6 +232,12 @@ public Builder setGroup(RaftGroup group) {
 return this;
 }

 /** Set the startup option for the group. */
 public Builder setOption(RaftStorage.StartupOption option) {
 this.option = option;
 return this;
 }

 /** Set {@link RaftProperties}. */
 public Builder setProperties(RaftProperties properties) {
 this.properties = properties;
Expand Down

5 changes: 2 additions & 3 deletions
ratis-server-api/src/main/java/org/apache/ratis/server/storage/RaftStorage.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -62,8 +62,7 @@ class Builder {

 private static Method initNewRaftStorageMethod() {
 final String className = RaftStorage.class.getPackage().getName() + ".StorageImplUtils";
 //final String className = "org.apache.ratis.server.storage.RaftStorageImpl";
 final Class<?>[] argClasses = { File.class, CorruptionPolicy.class, StartupOption.class, long.class };
 final Class<?>[] argClasses = {File.class, SizeInBytes.class, StartupOption.class, CorruptionPolicy.class};
 try {
 final Class<?> clazz = ReflectionUtils.getClassByName(className);
 return clazz.getMethod("newRaftStorage", argClasses);
Expand All@@ -76,7 +75,7 @@ private static RaftStorage newRaftStorage(File dir, CorruptionPolicy logCorrupti
 StartupOption option, SizeInBytes storageFreeSpaceMin) throws IOException {
 try {
 return (RaftStorage) NEW_RAFT_STORAGE_METHOD.invoke(null,
 dir, logCorruptionPolicy, option, storageFreeSpaceMin.getSize());
 dir, storageFreeSpaceMin, option, logCorruptionPolicy);
 } catch (IllegalAccessException e) {
 throw new IllegalStateException("Failed to build " + dir, e);
 } catch (InvocationTargetException e) {
Expand Down

9 changes: 5 additions & 4 deletions
ratis-server/src/main/java/org/apache/ratis/server/impl/RaftServerImpl.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -189,7 +189,8 @@ public long[] getFollowerNextIndices() {

 private final AtomicBoolean firstElectionSinceStartup = new AtomicBoolean(true);

 RaftServerImpl(RaftGroup group, StateMachine stateMachine, RaftServerProxy proxy) throws IOException {
 RaftServerImpl(RaftGroup group, StateMachine stateMachine, RaftServerProxy proxy, RaftStorage.StartupOption option)
 throws IOException {
 final RaftPeerId id = proxy.getId();
 LOG.info("{}: new RaftServerImpl for {} with {}", id, group, stateMachine);
 this.lifeCycle = new LifeCycle(id);
Expand All@@ -202,7 +203,7 @@ public long[] getFollowerNextIndices() {
 this.sleepDeviationThreshold = RaftServerConfigKeys.sleepDeviationThreshold(properties);
 this.proxy = proxy;

 this.state = new ServerState(id, group, properties, this, stateMachine);
 this.state = new ServerState(id, group, stateMachine, this, option, properties);
 this.retryCache = new RetryCacheImpl(properties);
 this.dataStreamMap = new DataStreamMapImpl(id);

Expand DownExpand Up@@ -575,8 +576,8 @@ public Collection<CommitInfoProto> getCommitInfos() {
 }

 GroupInfoReply getGroupInfo(GroupInfoRequest request) {
return new GroupInfoReply(request, getCommitInfos(),
 getGroup(), getRoleInfoProto(), state.getStorage().getStorageDir().isHealthy());
final RaftStorageDirectory dir = state.getStorage().getStorageDir();
return new GroupInfoReply(request, getCommitInfos(), getGroup(), getRoleInfoProto(), dir.isHealthy());
 }

 RoleInfoProto getRoleInfoProto() {
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
RATIS-1677. Do not auto format RaftStorage in RECOVER.#718

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

szetszwo
merged 3 commits into

from

Aug 26, 2022
 Merged


RATIS-1677. Do not auto format RaftStorage in RECOVER.
#718
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
542eb08

RATIS-1677. Do not auto format RaftStorage in RECOVER.


szetszwo Aug 19, 2022
252fa19

Address review comments.


szetszwo Aug 24, 2022
8012c4e

Remove the vol from dirsPerVol.


szetszwo Aug 25, 2022

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


12 changes: 10 additions & 2 deletions
ratis-client/src/main/java/org/apache/ratis/client/api/GroupManagementApi.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,8 +29,16 @@
 * APIs to support group management operations such as add, remove, list and info to a particular server.
 */
public interface GroupManagementApi {
 /** Add a new group. */
 RaftClientReply add(RaftGroup newGroup) throws IOException;
 /**
 * Add a new group.
 * @param format Should it format the storage?
 */
 RaftClientReply add(RaftGroup newGroup, boolean format) throws IOException;

 /** The same as add(newGroup, true). */
 default RaftClientReply add(RaftGroup newGroup) throws IOException {
 return add(newGroup, true);
 }

 /** Remove a group. */
 RaftClientReply remove(RaftGroupId groupId, boolean deleteDirectory, boolean renameDirectory) throws IOException;
Expand Down

9 changes: 6 additions & 3 deletions
ratis-client/src/main/java/org/apache/ratis/client/impl/ClientProtoUtils.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -571,8 +571,9 @@ static GroupManagementRequest toGroupManagementRequest(GroupManagementRequestPro
 final RaftPeerId serverId = RaftPeerId.valueOf(m.getReplyId());
 switch(p.getOpCase()) {
 case GROUPADD:
 final GroupAddRequestProto add = p.getGroupAdd();
 return GroupManagementRequest.newAdd(clientId, serverId, m.getCallId(),
 ProtoUtils.toRaftGroup(p.getGroupAdd().getGroup()));
 ProtoUtils.toRaftGroup(add.getGroup()), add.getFormat());
 case GROUPREMOVE:
 final GroupRemoveRequestProto remove = p.getGroupRemove();
 return GroupManagementRequest.newRemove(clientId, serverId, m.getCallId(),
Expand DownExpand Up@@ -609,8 +610,10 @@ static GroupManagementRequestProto toGroupManagementRequestProto(GroupManagement
 .setRpcRequest(toRaftRpcRequestProtoBuilder(request));
 final GroupManagementRequest.Add add = request.getAdd();
 if (add != null) {
 b.setGroupAdd(GroupAddRequestProto.newBuilder().setGroup(
 ProtoUtils.toRaftGroupProtoBuilder(add.getGroup())).build());
 b.setGroupAdd(GroupAddRequestProto.newBuilder()
 .setGroup(ProtoUtils.toRaftGroupProtoBuilder(add.getGroup()))
 .setFormat(add.isFormat())
 .build());
 }
 final GroupManagementRequest.Remove remove = request.getRemove();
 if (remove != null) {
Expand Down

4 changes: 2 additions & 2 deletions
ratis-client/src/main/java/org/apache/ratis/client/impl/GroupManagementImpl.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -43,13 +43,13 @@ class GroupManagementImpl implements GroupManagementApi {
 }

 @Override
 public RaftClientReply add(RaftGroup newGroup) throws IOException {
 public RaftClientReply add(RaftGroup newGroup, boolean format) throws IOException {
 Objects.requireNonNull(newGroup, "newGroup == null");

 final long callId = CallId.getAndIncrement();
 client.getClientRpc().addRaftPeers(newGroup.getPeers());
 return client.io().sendRequestWithRetry(
 () -> GroupManagementRequest.newAdd(client.getId(), server, callId, newGroup));
 () -> GroupManagementRequest.newAdd(client.getId(), server, callId, newGroup, format));
 }

 @Override
Expand Down

13 changes: 10 additions & 3 deletions
ratis-common/src/main/java/org/apache/ratis/protocol/GroupManagementRequest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,9 +26,11 @@ public abstract static class Op {

 public static class Add extends Op {
 private final RaftGroup group;
 private final boolean format;

 public Add(RaftGroup group) {
 public Add(RaftGroup group, boolean format) {
 this.group = group;
 this.format = format;
 }

 @Override
Expand All@@ -40,6 +42,10 @@ public RaftGroup getGroup() {
 return group;
 }

 public boolean isFormat() {
 return format;
 }

 @Override
 public String toString() {
 return JavaUtils.getClassSimpleName(getClass()) + ":" + getGroup();
Expand DownExpand Up@@ -79,8 +85,9 @@ public String toString() {
 }
 }

 public static GroupManagementRequest newAdd(ClientId clientId, RaftPeerId serverId, long callId, RaftGroup group) {
 return new GroupManagementRequest(clientId, serverId, callId, new Add(group));
 public static GroupManagementRequest newAdd(ClientId clientId, RaftPeerId serverId, long callId,
 RaftGroup group, boolean format) {
 return new GroupManagementRequest(clientId, serverId, callId, new Add(group, format));
 }

 public static GroupManagementRequest newRemove(ClientId clientId, RaftPeerId serverId, long callId,
Expand Down

90 changes: 90 additions & 0 deletions
ratis-common/src/main/java/org/apache/ratis/util/MemoizedCheckedSupplier.java

View file


Open in desktop

Original file line numberDiff line numberDiff 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.ratis.util;

import org.apache.ratis.util.function.CheckedSupplier;

import java.util.Objects;

/**
 * A memoized supplier is a {@link CheckedSupplier}
 * which gets a value by invoking its initializer once.
 * and then keeps returning the same value as its supplied results.
 *
 * This class is thread safe.
 *
 * @param <RETURN> The return type of the supplier.
 * @param <THROW> The throwable type of the supplier.
 */
public final class MemoizedCheckedSupplier<RETURN, THROW extends Throwable>
 implements CheckedSupplier<RETURN, THROW> {
 /**
 * @param supplier to supply at most one non-null value.
 * @return a {@link MemoizedCheckedSupplier} with the given supplier.
 */
 public static <RETURN, THROW extends Throwable> MemoizedCheckedSupplier<RETURN, THROW> valueOf(
 CheckedSupplier<RETURN, THROW> supplier) {
 return supplier instanceof MemoizedCheckedSupplier ?
 (MemoizedCheckedSupplier<RETURN, THROW>) supplier : new MemoizedCheckedSupplier<>(supplier);
 }

 private final CheckedSupplier<RETURN, THROW> initializer;
 private volatile RETURN value = null;

 /**
 * Create a memoized supplier.
 * @param initializer to supply at most one non-null value.
 */
 private MemoizedCheckedSupplier(CheckedSupplier<RETURN, THROW> initializer) {
 Objects.requireNonNull(initializer, "initializer == null");
 this.initializer = initializer;
 }

 /** @return the lazily initialized object. */
 @Override
 public RETURN get() throws THROW {
 RETURN v = value;
 if (v == null) {
 synchronized (this) {
 v = value;
 if (v == null) {
 v = value = Objects.requireNonNull(initializer.get(), "initializer.get() returns null");
 }
 }
 }
 return v;
 }

 /**
 * @return the already initialized object.
 * @throws NullPointerException if the object is uninitialized.
 */
 public RETURN getUnchecked() {
 return Objects.requireNonNull(value, "value == null");
 }

 /** @return is the object initialized? */
 public boolean isInitialized() {
 return value != null;
 }

 @Override
 public String toString() {
 return isInitialized()? "Memoized:" + value: "UNINITIALIZED";
 }
}

5 changes: 5 additions & 0 deletions
ratis-common/src/main/java/org/apache/ratis/util/Preconditions.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,7 @@

import java.util.Collections;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
import java.util.function.Supplier;

Expand DownExpand Up@@ -113,6 +114,10 @@ static <T> T assertInstanceOf(Object object, Class<T> clazz) {
 return clazz.cast(object);
 }

 static <K, V> void assertEmpty(Map<K, V> map, Object name) {
 assertTrue(map.isEmpty(), () -> "The " + name + " map is non-empty: " + map);
 }

 static <T> void assertUnique(Iterable<T> first) {
 assertUnique(first, Collections.emptyList());
 }
Expand Down

1 change: 1 addition & 0 deletions
ratis-common/src/main/java/org/apache/ratis/util/SizeInBytes.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,7 @@
 * Size which may be constructed with a {@link TraditionalBinaryPrefix}.
 */
public final class SizeInBytes {
 public static final SizeInBytes ZERO = valueOf(0);
 public static final SizeInBytes ONE_KB = valueOf("1k");
 public static final SizeInBytes ONE_MB = valueOf("1m");

Expand Down

1 change: 1 addition & 0 deletions
ratis-proto/src/main/proto/Raft.proto

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -469,6 +469,7 @@ message StartLeaderElectionReplyProto {
// A request to add a new group
message GroupAddRequestProto {
 RaftGroupProto group = 1; // the group to be added.
 bool format = 2; // Should it format the storage?
}

message GroupRemoveRequestProto {
Expand Down

16 changes: 12 additions & 4 deletions
ratis-server-api/src/main/java/org/apache/ratis/server/RaftServer.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -167,8 +167,8 @@ class Builder {

 private static Method initNewRaftServerMethod() {
 final String className = RaftServer.class.getPackage().getName() + ".impl.ServerImplUtils";
 final Class<?>[] argClasses = {RaftPeerId.class, RaftGroup.class, StateMachine.Registry.class,
 RaftProperties.class, Parameters.class};
 final Class<?>[] argClasses = {RaftPeerId.class, RaftGroup.class, RaftStorage.StartupOption.class,
StateMachine.Registry.class, RaftProperties.class, Parameters.class};
 try {
 final Class<?> clazz = ReflectionUtils.getClassByName(className);
 return clazz.getMethod("newRaftServer", argClasses);
Expand All@@ -177,12 +177,12 @@ private static Method initNewRaftServerMethod() {
 }
 }

 private static RaftServer newRaftServer(RaftPeerId serverId, RaftGroup group,
 private static RaftServer newRaftServer(RaftPeerId serverId, RaftGroup group, RaftStorage.StartupOption option,
 StateMachine.Registry stateMachineRegistry, RaftProperties properties, Parameters parameters)
 throws IOException {
 try {
 return (RaftServer) NEW_RAFT_SERVER_METHOD.invoke(null,
 serverId, group, stateMachineRegistry, properties, parameters);
 serverId, group, option, stateMachineRegistry, properties, parameters);
 } catch (IllegalAccessException e) {
 throw new IllegalStateException("Failed to build " + serverId, e);
 } catch (InvocationTargetException e) {
Expand All@@ -193,6 +193,7 @@ private static RaftServer newRaftServer(RaftPeerId serverId, RaftGroup group,
 private RaftPeerId serverId;
 private StateMachine.Registry stateMachineRegistry ;
 private RaftGroup group = null;
 private RaftStorage.StartupOption option = RaftStorage.StartupOption.RECOVER;
 private RaftProperties properties;
 private Parameters parameters;

Expand All@@ -201,6 +202,7 @@ public RaftServer build() throws IOException {
 return newRaftServer(
 serverId,
 group,
 option,
 Objects.requireNonNull(stateMachineRegistry , "Neither 'stateMachine' nor 'setStateMachineRegistry' " +
 "is initialized."),
 Objects.requireNonNull(properties, "The 'properties' field is not initialized."),
Expand DownExpand Up@@ -230,6 +232,12 @@ public Builder setGroup(RaftGroup group) {
 return this;
 }

 /** Set the startup option for the group. */
 public Builder setOption(RaftStorage.StartupOption option) {
 this.option = option;
 return this;
 }

 /** Set {@link RaftProperties}. */
 public Builder setProperties(RaftProperties properties) {
 this.properties = properties;
Expand Down

5 changes: 2 additions & 3 deletions
ratis-server-api/src/main/java/org/apache/ratis/server/storage/RaftStorage.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -62,8 +62,7 @@ class Builder {

 private static Method initNewRaftStorageMethod() {
 final String className = RaftStorage.class.getPackage().getName() + ".StorageImplUtils";
 //final String className = "org.apache.ratis.server.storage.RaftStorageImpl";
 final Class<?>[] argClasses = { File.class, CorruptionPolicy.class, StartupOption.class, long.class };
 final Class<?>[] argClasses = {File.class, SizeInBytes.class, StartupOption.class, CorruptionPolicy.class};
 try {
 final Class<?> clazz = ReflectionUtils.getClassByName(className);
 return clazz.getMethod("newRaftStorage", argClasses);
Expand All@@ -76,7 +75,7 @@ private static RaftStorage newRaftStorage(File dir, CorruptionPolicy logCorrupti
 StartupOption option, SizeInBytes storageFreeSpaceMin) throws IOException {
 try {
 return (RaftStorage) NEW_RAFT_STORAGE_METHOD.invoke(null,
 dir, logCorruptionPolicy, option, storageFreeSpaceMin.getSize());
 dir, storageFreeSpaceMin, option, logCorruptionPolicy);
 } catch (IllegalAccessException e) {
 throw new IllegalStateException("Failed to build " + dir, e);
 } catch (InvocationTargetException e) {
Expand Down

9 changes: 5 additions & 4 deletions
ratis-server/src/main/java/org/apache/ratis/server/impl/RaftServerImpl.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -189,7 +189,8 @@ public long[] getFollowerNextIndices() {

 private final AtomicBoolean firstElectionSinceStartup = new AtomicBoolean(true);

 RaftServerImpl(RaftGroup group, StateMachine stateMachine, RaftServerProxy proxy) throws IOException {
 RaftServerImpl(RaftGroup group, StateMachine stateMachine, RaftServerProxy proxy, RaftStorage.StartupOption option)
 throws IOException {
 final RaftPeerId id = proxy.getId();
 LOG.info("{}: new RaftServerImpl for {} with {}", id, group, stateMachine);
 this.lifeCycle = new LifeCycle(id);
Expand All@@ -202,7 +203,7 @@ public long[] getFollowerNextIndices() {
 this.sleepDeviationThreshold = RaftServerConfigKeys.sleepDeviationThreshold(properties);
 this.proxy = proxy;

 this.state = new ServerState(id, group, properties, this, stateMachine);
 this.state = new ServerState(id, group, stateMachine, this, option, properties);
 this.retryCache = new RetryCacheImpl(properties);
 this.dataStreamMap = new DataStreamMapImpl(id);

Expand DownExpand Up@@ -575,8 +576,8 @@ public Collection<CommitInfoProto> getCommitInfos() {
 }

 GroupInfoReply getGroupInfo(GroupInfoRequest request) {
return new GroupInfoReply(request, getCommitInfos(),
 getGroup(), getRoleInfoProto(), state.getStorage().getStorageDir().isHealthy());
final RaftStorageDirectory dir = state.getStorage().getStorageDir();
return new GroupInfoReply(request, getCommitInfos(), getGroup(), getRoleInfoProto(), dir.isHealthy());
 }

 RoleInfoProto getRoleInfoProto() {
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
RATIS-1677. Do not auto format RaftStorage in RECOVER.#718

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

szetszwo
merged 3 commits into

from

Aug 26, 2022
 Merged


RATIS-1677. Do not auto format RaftStorage in RECOVER.
#718
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
542eb08

RATIS-1677. Do not auto format RaftStorage in RECOVER.


szetszwo Aug 19, 2022
252fa19

Address review comments.


szetszwo Aug 24, 2022
8012c4e

Remove the vol from dirsPerVol.


szetszwo Aug 25, 2022

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


12 changes: 10 additions & 2 deletions
ratis-client/src/main/java/org/apache/ratis/client/api/GroupManagementApi.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,8 +29,16 @@
 * APIs to support group management operations such as add, remove, list and info to a particular server.
 */
public interface GroupManagementApi {
 /** Add a new group. */
 RaftClientReply add(RaftGroup newGroup) throws IOException;
 /**
 * Add a new group.
 * @param format Should it format the storage?
 */
 RaftClientReply add(RaftGroup newGroup, boolean format) throws IOException;

 /** The same as add(newGroup, true). */
 default RaftClientReply add(RaftGroup newGroup) throws IOException {
 return add(newGroup, true);
 }

 /** Remove a group. */
 RaftClientReply remove(RaftGroupId groupId, boolean deleteDirectory, boolean renameDirectory) throws IOException;
Expand Down

9 changes: 6 additions & 3 deletions
ratis-client/src/main/java/org/apache/ratis/client/impl/ClientProtoUtils.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -571,8 +571,9 @@ static GroupManagementRequest toGroupManagementRequest(GroupManagementRequestPro
 final RaftPeerId serverId = RaftPeerId.valueOf(m.getReplyId());
 switch(p.getOpCase()) {
 case GROUPADD:
 final GroupAddRequestProto add = p.getGroupAdd();
 return GroupManagementRequest.newAdd(clientId, serverId, m.getCallId(),
 ProtoUtils.toRaftGroup(p.getGroupAdd().getGroup()));
 ProtoUtils.toRaftGroup(add.getGroup()), add.getFormat());
 case GROUPREMOVE:
 final GroupRemoveRequestProto remove = p.getGroupRemove();
 return GroupManagementRequest.newRemove(clientId, serverId, m.getCallId(),
Expand DownExpand Up@@ -609,8 +610,10 @@ static GroupManagementRequestProto toGroupManagementRequestProto(GroupManagement
 .setRpcRequest(toRaftRpcRequestProtoBuilder(request));
 final GroupManagementRequest.Add add = request.getAdd();
 if (add != null) {
 b.setGroupAdd(GroupAddRequestProto.newBuilder().setGroup(
 ProtoUtils.toRaftGroupProtoBuilder(add.getGroup())).build());
 b.setGroupAdd(GroupAddRequestProto.newBuilder()
 .setGroup(ProtoUtils.toRaftGroupProtoBuilder(add.getGroup()))
 .setFormat(add.isFormat())
 .build());
 }
 final GroupManagementRequest.Remove remove = request.getRemove();
 if (remove != null) {
Expand Down

4 changes: 2 additions & 2 deletions
ratis-client/src/main/java/org/apache/ratis/client/impl/GroupManagementImpl.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -43,13 +43,13 @@ class GroupManagementImpl implements GroupManagementApi {
 }

 @Override
 public RaftClientReply add(RaftGroup newGroup) throws IOException {
 public RaftClientReply add(RaftGroup newGroup, boolean format) throws IOException {
 Objects.requireNonNull(newGroup, "newGroup == null");

 final long callId = CallId.getAndIncrement();
 client.getClientRpc().addRaftPeers(newGroup.getPeers());
 return client.io().sendRequestWithRetry(
 () -> GroupManagementRequest.newAdd(client.getId(), server, callId, newGroup));
 () -> GroupManagementRequest.newAdd(client.getId(), server, callId, newGroup, format));
 }

 @Override
Expand Down

13 changes: 10 additions & 3 deletions
ratis-common/src/main/java/org/apache/ratis/protocol/GroupManagementRequest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,9 +26,11 @@ public abstract static class Op {

 public static class Add extends Op {
 private final RaftGroup group;
 private final boolean format;

 public Add(RaftGroup group) {
 public Add(RaftGroup group, boolean format) {
 this.group = group;
 this.format = format;
 }

 @Override
Expand All@@ -40,6 +42,10 @@ public RaftGroup getGroup() {
 return group;
 }

 public boolean isFormat() {
 return format;
 }

 @Override
 public String toString() {
 return JavaUtils.getClassSimpleName(getClass()) + ":" + getGroup();
Expand DownExpand Up@@ -79,8 +85,9 @@ public String toString() {
 }
 }

 public static GroupManagementRequest newAdd(ClientId clientId, RaftPeerId serverId, long callId, RaftGroup group) {
 return new GroupManagementRequest(clientId, serverId, callId, new Add(group));
 public static GroupManagementRequest newAdd(ClientId clientId, RaftPeerId serverId, long callId,
 RaftGroup group, boolean format) {
 return new GroupManagementRequest(clientId, serverId, callId, new Add(group, format));
 }

 public static GroupManagementRequest newRemove(ClientId clientId, RaftPeerId serverId, long callId,
Expand Down

90 changes: 90 additions & 0 deletions
ratis-common/src/main/java/org/apache/ratis/util/MemoizedCheckedSupplier.java

View file


Open in desktop

Original file line numberDiff line numberDiff 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.ratis.util;

import org.apache.ratis.util.function.CheckedSupplier;

import java.util.Objects;

/**
 * A memoized supplier is a {@link CheckedSupplier}
 * which gets a value by invoking its initializer once.
 * and then keeps returning the same value as its supplied results.
 *
 * This class is thread safe.
 *
 * @param <RETURN> The return type of the supplier.
 * @param <THROW> The throwable type of the supplier.
 */
public final class MemoizedCheckedSupplier<RETURN, THROW extends Throwable>
 implements CheckedSupplier<RETURN, THROW> {
 /**
 * @param supplier to supply at most one non-null value.
 * @return a {@link MemoizedCheckedSupplier} with the given supplier.
 */
 public static <RETURN, THROW extends Throwable> MemoizedCheckedSupplier<RETURN, THROW> valueOf(
 CheckedSupplier<RETURN, THROW> supplier) {
 return supplier instanceof MemoizedCheckedSupplier ?
 (MemoizedCheckedSupplier<RETURN, THROW>) supplier : new MemoizedCheckedSupplier<>(supplier);
 }

 private final CheckedSupplier<RETURN, THROW> initializer;
 private volatile RETURN value = null;

 /**
 * Create a memoized supplier.
 * @param initializer to supply at most one non-null value.
 */
 private MemoizedCheckedSupplier(CheckedSupplier<RETURN, THROW> initializer) {
 Objects.requireNonNull(initializer, "initializer == null");
 this.initializer = initializer;
 }

 /** @return the lazily initialized object. */
 @Override
 public RETURN get() throws THROW {
 RETURN v = value;
 if (v == null) {
 synchronized (this) {
 v = value;
 if (v == null) {
 v = value = Objects.requireNonNull(initializer.get(), "initializer.get() returns null");
 }
 }
 }
 return v;
 }

 /**
 * @return the already initialized object.
 * @throws NullPointerException if the object is uninitialized.
 */
 public RETURN getUnchecked() {
 return Objects.requireNonNull(value, "value == null");
 }

 /** @return is the object initialized? */
 public boolean isInitialized() {
 return value != null;
 }

 @Override
 public String toString() {
 return isInitialized()? "Memoized:" + value: "UNINITIALIZED";
 }
}

5 changes: 5 additions & 0 deletions
ratis-common/src/main/java/org/apache/ratis/util/Preconditions.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,7 @@

import java.util.Collections;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
import java.util.function.Supplier;

Expand DownExpand Up@@ -113,6 +114,10 @@ static <T> T assertInstanceOf(Object object, Class<T> clazz) {
 return clazz.cast(object);
 }

 static <K, V> void assertEmpty(Map<K, V> map, Object name) {
 assertTrue(map.isEmpty(), () -> "The " + name + " map is non-empty: " + map);
 }

 static <T> void assertUnique(Iterable<T> first) {
 assertUnique(first, Collections.emptyList());
 }
Expand Down

1 change: 1 addition & 0 deletions
ratis-common/src/main/java/org/apache/ratis/util/SizeInBytes.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,7 @@
 * Size which may be constructed with a {@link TraditionalBinaryPrefix}.
 */
public final class SizeInBytes {
 public static final SizeInBytes ZERO = valueOf(0);
 public static final SizeInBytes ONE_KB = valueOf("1k");
 public static final SizeInBytes ONE_MB = valueOf("1m");

Expand Down

1 change: 1 addition & 0 deletions
ratis-proto/src/main/proto/Raft.proto

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -469,6 +469,7 @@ message StartLeaderElectionReplyProto {
// A request to add a new group
message GroupAddRequestProto {
 RaftGroupProto group = 1; // the group to be added.
 bool format = 2; // Should it format the storage?
}

message GroupRemoveRequestProto {
Expand Down

16 changes: 12 additions & 4 deletions
ratis-server-api/src/main/java/org/apache/ratis/server/RaftServer.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -167,8 +167,8 @@ class Builder {

 private static Method initNewRaftServerMethod() {
 final String className = RaftServer.class.getPackage().getName() + ".impl.ServerImplUtils";
 final Class<?>[] argClasses = {RaftPeerId.class, RaftGroup.class, StateMachine.Registry.class,
 RaftProperties.class, Parameters.class};
 final Class<?>[] argClasses = {RaftPeerId.class, RaftGroup.class, RaftStorage.StartupOption.class,
StateMachine.Registry.class, RaftProperties.class, Parameters.class};
 try {
 final Class<?> clazz = ReflectionUtils.getClassByName(className);
 return clazz.getMethod("newRaftServer", argClasses);
Expand All@@ -177,12 +177,12 @@ private static Method initNewRaftServerMethod() {
 }
 }

 private static RaftServer newRaftServer(RaftPeerId serverId, RaftGroup group,
 private static RaftServer newRaftServer(RaftPeerId serverId, RaftGroup group, RaftStorage.StartupOption option,
 StateMachine.Registry stateMachineRegistry, RaftProperties properties, Parameters parameters)
 throws IOException {
 try {
 return (RaftServer) NEW_RAFT_SERVER_METHOD.invoke(null,
 serverId, group, stateMachineRegistry, properties, parameters);
 serverId, group, option, stateMachineRegistry, properties, parameters);
 } catch (IllegalAccessException e) {
 throw new IllegalStateException("Failed to build " + serverId, e);
 } catch (InvocationTargetException e) {
Expand All@@ -193,6 +193,7 @@ private static RaftServer newRaftServer(RaftPeerId serverId, RaftGroup group,
 private RaftPeerId serverId;
 private StateMachine.Registry stateMachineRegistry ;
 private RaftGroup group = null;
 private RaftStorage.StartupOption option = RaftStorage.StartupOption.RECOVER;
 private RaftProperties properties;
 private Parameters parameters;

Expand All@@ -201,6 +202,7 @@ public RaftServer build() throws IOException {
 return newRaftServer(
 serverId,
 group,
 option,
 Objects.requireNonNull(stateMachineRegistry , "Neither 'stateMachine' nor 'setStateMachineRegistry' " +
 "is initialized."),
 Objects.requireNonNull(properties, "The 'properties' field is not initialized."),
Expand DownExpand Up@@ -230,6 +232,12 @@ public Builder setGroup(RaftGroup group) {
 return this;
 }

 /** Set the startup option for the group. */
 public Builder setOption(RaftStorage.StartupOption option) {
 this.option = option;
 return this;
 }

 /** Set {@link RaftProperties}. */
 public Builder setProperties(RaftProperties properties) {
 this.properties = properties;
Expand Down

5 changes: 2 additions & 3 deletions
ratis-server-api/src/main/java/org/apache/ratis/server/storage/RaftStorage.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -62,8 +62,7 @@ class Builder {

 private static Method initNewRaftStorageMethod() {
 final String className = RaftStorage.class.getPackage().getName() + ".StorageImplUtils";
 //final String className = "org.apache.ratis.server.storage.RaftStorageImpl";
 final Class<?>[] argClasses = { File.class, CorruptionPolicy.class, StartupOption.class, long.class };
 final Class<?>[] argClasses = {File.class, SizeInBytes.class, StartupOption.class, CorruptionPolicy.class};
 try {
 final Class<?> clazz = ReflectionUtils.getClassByName(className);
 return clazz.getMethod("newRaftStorage", argClasses);
Expand All@@ -76,7 +75,7 @@ private static RaftStorage newRaftStorage(File dir, CorruptionPolicy logCorrupti
 StartupOption option, SizeInBytes storageFreeSpaceMin) throws IOException {
 try {
 return (RaftStorage) NEW_RAFT_STORAGE_METHOD.invoke(null,
 dir, logCorruptionPolicy, option, storageFreeSpaceMin.getSize());
 dir, storageFreeSpaceMin, option, logCorruptionPolicy);
 } catch (IllegalAccessException e) {
 throw new IllegalStateException("Failed to build " + dir, e);
 } catch (InvocationTargetException e) {
Expand Down

9 changes: 5 additions & 4 deletions
ratis-server/src/main/java/org/apache/ratis/server/impl/RaftServerImpl.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -189,7 +189,8 @@ public long[] getFollowerNextIndices() {

 private final AtomicBoolean firstElectionSinceStartup = new AtomicBoolean(true);

 RaftServerImpl(RaftGroup group, StateMachine stateMachine, RaftServerProxy proxy) throws IOException {
 RaftServerImpl(RaftGroup group, StateMachine stateMachine, RaftServerProxy proxy, RaftStorage.StartupOption option)
 throws IOException {
 final RaftPeerId id = proxy.getId();
 LOG.info("{}: new RaftServerImpl for {} with {}", id, group, stateMachine);
 this.lifeCycle = new LifeCycle(id);
Expand All@@ -202,7 +203,7 @@ public long[] getFollowerNextIndices() {
 this.sleepDeviationThreshold = RaftServerConfigKeys.sleepDeviationThreshold(properties);
 this.proxy = proxy;

 this.state = new ServerState(id, group, properties, this, stateMachine);
 this.state = new ServerState(id, group, stateMachine, this, option, properties);
 this.retryCache = new RetryCacheImpl(properties);
 this.dataStreamMap = new DataStreamMapImpl(id);

Expand DownExpand Up@@ -575,8 +576,8 @@ public Collection<CommitInfoProto> getCommitInfos() {
 }

 GroupInfoReply getGroupInfo(GroupInfoRequest request) {
return new GroupInfoReply(request, getCommitInfos(),
 getGroup(), getRoleInfoProto(), state.getStorage().getStorageDir().isHealthy());
final RaftStorageDirectory dir = state.getStorage().getStorageDir();
return new GroupInfoReply(request, getCommitInfos(), getGroup(), getRoleInfoProto(), dir.isHealthy());
 }

 RoleInfoProto getRoleInfoProto() {
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
RATIS-1677. Do not auto format RaftStorage in RECOVER.#718

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

szetszwo
merged 3 commits into

from

Aug 26, 2022
 Merged


RATIS-1677. Do not auto format RaftStorage in RECOVER.
#718
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
542eb08

RATIS-1677. Do not auto format RaftStorage in RECOVER.


szetszwo Aug 19, 2022
252fa19

Address review comments.


szetszwo Aug 24, 2022
8012c4e

Remove the vol from dirsPerVol.


szetszwo Aug 25, 2022

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


12 changes: 10 additions & 2 deletions
ratis-client/src/main/java/org/apache/ratis/client/api/GroupManagementApi.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,8 +29,16 @@
 * APIs to support group management operations such as add, remove, list and info to a particular server.
 */
public interface GroupManagementApi {
 /** Add a new group. */
 RaftClientReply add(RaftGroup newGroup) throws IOException;
 /**
 * Add a new group.
 * @param format Should it format the storage?
 */
 RaftClientReply add(RaftGroup newGroup, boolean format) throws IOException;

 /** The same as add(newGroup, true). */
 default RaftClientReply add(RaftGroup newGroup) throws IOException {
 return add(newGroup, true);
 }

 /** Remove a group. */
 RaftClientReply remove(RaftGroupId groupId, boolean deleteDirectory, boolean renameDirectory) throws IOException;
Expand Down

9 changes: 6 additions & 3 deletions
ratis-client/src/main/java/org/apache/ratis/client/impl/ClientProtoUtils.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -571,8 +571,9 @@ static GroupManagementRequest toGroupManagementRequest(GroupManagementRequestPro
 final RaftPeerId serverId = RaftPeerId.valueOf(m.getReplyId());
 switch(p.getOpCase()) {
 case GROUPADD:
 final GroupAddRequestProto add = p.getGroupAdd();
 return GroupManagementRequest.newAdd(clientId, serverId, m.getCallId(),
 ProtoUtils.toRaftGroup(p.getGroupAdd().getGroup()));
 ProtoUtils.toRaftGroup(add.getGroup()), add.getFormat());
 case GROUPREMOVE:
 final GroupRemoveRequestProto remove = p.getGroupRemove();
 return GroupManagementRequest.newRemove(clientId, serverId, m.getCallId(),
Expand DownExpand Up@@ -609,8 +610,10 @@ static GroupManagementRequestProto toGroupManagementRequestProto(GroupManagement
 .setRpcRequest(toRaftRpcRequestProtoBuilder(request));
 final GroupManagementRequest.Add add = request.getAdd();
 if (add != null) {
 b.setGroupAdd(GroupAddRequestProto.newBuilder().setGroup(
 ProtoUtils.toRaftGroupProtoBuilder(add.getGroup())).build());
 b.setGroupAdd(GroupAddRequestProto.newBuilder()
 .setGroup(ProtoUtils.toRaftGroupProtoBuilder(add.getGroup()))
 .setFormat(add.isFormat())
 .build());
 }
 final GroupManagementRequest.Remove remove = request.getRemove();
 if (remove != null) {
Expand Down

4 changes: 2 additions & 2 deletions
ratis-client/src/main/java/org/apache/ratis/client/impl/GroupManagementImpl.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -43,13 +43,13 @@ class GroupManagementImpl implements GroupManagementApi {
 }

 @Override
 public RaftClientReply add(RaftGroup newGroup) throws IOException {
 public RaftClientReply add(RaftGroup newGroup, boolean format) throws IOException {
 Objects.requireNonNull(newGroup, "newGroup == null");

 final long callId = CallId.getAndIncrement();
 client.getClientRpc().addRaftPeers(newGroup.getPeers());
 return client.io().sendRequestWithRetry(
 () -> GroupManagementRequest.newAdd(client.getId(), server, callId, newGroup));
 () -> GroupManagementRequest.newAdd(client.getId(), server, callId, newGroup, format));
 }

 @Override
Expand Down

13 changes: 10 additions & 3 deletions
ratis-common/src/main/java/org/apache/ratis/protocol/GroupManagementRequest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,9 +26,11 @@ public abstract static class Op {

 public static class Add extends Op {
 private final RaftGroup group;
 private final boolean format;

 public Add(RaftGroup group) {
 public Add(RaftGroup group, boolean format) {
 this.group = group;
 this.format = format;
 }

 @Override
Expand All@@ -40,6 +42,10 @@ public RaftGroup getGroup() {
 return group;
 }

 public boolean isFormat() {
 return format;
 }

 @Override
 public String toString() {
 return JavaUtils.getClassSimpleName(getClass()) + ":" + getGroup();
Expand DownExpand Up@@ -79,8 +85,9 @@ public String toString() {
 }
 }

 public static GroupManagementRequest newAdd(ClientId clientId, RaftPeerId serverId, long callId, RaftGroup group) {
 return new GroupManagementRequest(clientId, serverId, callId, new Add(group));
 public static GroupManagementRequest newAdd(ClientId clientId, RaftPeerId serverId, long callId,
 RaftGroup group, boolean format) {
 return new GroupManagementRequest(clientId, serverId, callId, new Add(group, format));
 }

 public static GroupManagementRequest newRemove(ClientId clientId, RaftPeerId serverId, long callId,
Expand Down

90 changes: 90 additions & 0 deletions
ratis-common/src/main/java/org/apache/ratis/util/MemoizedCheckedSupplier.java

View file


Open in desktop

Original file line numberDiff line numberDiff 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.ratis.util;

import org.apache.ratis.util.function.CheckedSupplier;

import java.util.Objects;

/**
 * A memoized supplier is a {@link CheckedSupplier}
 * which gets a value by invoking its initializer once.
 * and then keeps returning the same value as its supplied results.
 *
 * This class is thread safe.
 *
 * @param <RETURN> The return type of the supplier.
 * @param <THROW> The throwable type of the supplier.
 */
public final class MemoizedCheckedSupplier<RETURN, THROW extends Throwable>
 implements CheckedSupplier<RETURN, THROW> {
 /**
 * @param supplier to supply at most one non-null value.
 * @return a {@link MemoizedCheckedSupplier} with the given supplier.
 */
 public static <RETURN, THROW extends Throwable> MemoizedCheckedSupplier<RETURN, THROW> valueOf(
 CheckedSupplier<RETURN, THROW> supplier) {
 return supplier instanceof MemoizedCheckedSupplier ?
 (MemoizedCheckedSupplier<RETURN, THROW>) supplier : new MemoizedCheckedSupplier<>(supplier);
 }

 private final CheckedSupplier<RETURN, THROW> initializer;
 private volatile RETURN value = null;

 /**
 * Create a memoized supplier.
 * @param initializer to supply at most one non-null value.
 */
 private MemoizedCheckedSupplier(CheckedSupplier<RETURN, THROW> initializer) {
 Objects.requireNonNull(initializer, "initializer == null");
 this.initializer = initializer;
 }

 /** @return the lazily initialized object. */
 @Override
 public RETURN get() throws THROW {
 RETURN v = value;
 if (v == null) {
 synchronized (this) {
 v = value;
 if (v == null) {
 v = value = Objects.requireNonNull(initializer.get(), "initializer.get() returns null");
 }
 }
 }
 return v;
 }

 /**
 * @return the already initialized object.
 * @throws NullPointerException if the object is uninitialized.
 */
 public RETURN getUnchecked() {
 return Objects.requireNonNull(value, "value == null");
 }

 /** @return is the object initialized? */
 public boolean isInitialized() {
 return value != null;
 }

 @Override
 public String toString() {
 return isInitialized()? "Memoized:" + value: "UNINITIALIZED";
 }
}

5 changes: 5 additions & 0 deletions
ratis-common/src/main/java/org/apache/ratis/util/Preconditions.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,7 @@

import java.util.Collections;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
import java.util.function.Supplier;

Expand DownExpand Up@@ -113,6 +114,10 @@ static <T> T assertInstanceOf(Object object, Class<T> clazz) {
 return clazz.cast(object);
 }

 static <K, V> void assertEmpty(Map<K, V> map, Object name) {
 assertTrue(map.isEmpty(), () -> "The " + name + " map is non-empty: " + map);
 }

 static <T> void assertUnique(Iterable<T> first) {
 assertUnique(first, Collections.emptyList());
 }
Expand Down

1 change: 1 addition & 0 deletions
ratis-common/src/main/java/org/apache/ratis/util/SizeInBytes.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,7 @@
 * Size which may be constructed with a {@link TraditionalBinaryPrefix}.
 */
public final class SizeInBytes {
 public static final SizeInBytes ZERO = valueOf(0);
 public static final SizeInBytes ONE_KB = valueOf("1k");
 public static final SizeInBytes ONE_MB = valueOf("1m");

Expand Down

1 change: 1 addition & 0 deletions
ratis-proto/src/main/proto/Raft.proto

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -469,6 +469,7 @@ message StartLeaderElectionReplyProto {
// A request to add a new group
message GroupAddRequestProto {
 RaftGroupProto group = 1; // the group to be added.
 bool format = 2; // Should it format the storage?
}

message GroupRemoveRequestProto {
Expand Down

16 changes: 12 additions & 4 deletions
ratis-server-api/src/main/java/org/apache/ratis/server/RaftServer.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -167,8 +167,8 @@ class Builder {

 private static Method initNewRaftServerMethod() {
 final String className = RaftServer.class.getPackage().getName() + ".impl.ServerImplUtils";
 final Class<?>[] argClasses = {RaftPeerId.class, RaftGroup.class, StateMachine.Registry.class,
 RaftProperties.class, Parameters.class};
 final Class<?>[] argClasses = {RaftPeerId.class, RaftGroup.class, RaftStorage.StartupOption.class,
StateMachine.Registry.class, RaftProperties.class, Parameters.class};
 try {
 final Class<?> clazz = ReflectionUtils.getClassByName(className);
 return clazz.getMethod("newRaftServer", argClasses);
Expand All@@ -177,12 +177,12 @@ private static Method initNewRaftServerMethod() {
 }
 }

 private static RaftServer newRaftServer(RaftPeerId serverId, RaftGroup group,
 private static RaftServer newRaftServer(RaftPeerId serverId, RaftGroup group, RaftStorage.StartupOption option,
 StateMachine.Registry stateMachineRegistry, RaftProperties properties, Parameters parameters)
 throws IOException {
 try {
 return (RaftServer) NEW_RAFT_SERVER_METHOD.invoke(null,
 serverId, group, stateMachineRegistry, properties, parameters);
 serverId, group, option, stateMachineRegistry, properties, parameters);
 } catch (IllegalAccessException e) {
 throw new IllegalStateException("Failed to build " + serverId, e);
 } catch (InvocationTargetException e) {
Expand All@@ -193,6 +193,7 @@ private static RaftServer newRaftServer(RaftPeerId serverId, RaftGroup group,
 private RaftPeerId serverId;
 private StateMachine.Registry stateMachineRegistry ;
 private RaftGroup group = null;
 private RaftStorage.StartupOption option = RaftStorage.StartupOption.RECOVER;
 private RaftProperties properties;
 private Parameters parameters;

Expand All@@ -201,6 +202,7 @@ public RaftServer build() throws IOException {
 return newRaftServer(
 serverId,
 group,
 option,
 Objects.requireNonNull(stateMachineRegistry , "Neither 'stateMachine' nor 'setStateMachineRegistry' " +
 "is initialized."),
 Objects.requireNonNull(properties, "The 'properties' field is not initialized."),
Expand DownExpand Up@@ -230,6 +232,12 @@ public Builder setGroup(RaftGroup group) {
 return this;
 }

 /** Set the startup option for the group. */
 public Builder setOption(RaftStorage.StartupOption option) {
 this.option = option;
 return this;
 }

 /** Set {@link RaftProperties}. */
 public Builder setProperties(RaftProperties properties) {
 this.properties = properties;
Expand Down

5 changes: 2 additions & 3 deletions
ratis-server-api/src/main/java/org/apache/ratis/server/storage/RaftStorage.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -62,8 +62,7 @@ class Builder {

 private static Method initNewRaftStorageMethod() {
 final String className = RaftStorage.class.getPackage().getName() + ".StorageImplUtils";
 //final String className = "org.apache.ratis.server.storage.RaftStorageImpl";
 final Class<?>[] argClasses = { File.class, CorruptionPolicy.class, StartupOption.class, long.class };
 final Class<?>[] argClasses = {File.class, SizeInBytes.class, StartupOption.class, CorruptionPolicy.class};
 try {
 final Class<?> clazz = ReflectionUtils.getClassByName(className);
 return clazz.getMethod("newRaftStorage", argClasses);
Expand All@@ -76,7 +75,7 @@ private static RaftStorage newRaftStorage(File dir, CorruptionPolicy logCorrupti
 StartupOption option, SizeInBytes storageFreeSpaceMin) throws IOException {
 try {
 return (RaftStorage) NEW_RAFT_STORAGE_METHOD.invoke(null,
 dir, logCorruptionPolicy, option, storageFreeSpaceMin.getSize());
 dir, storageFreeSpaceMin, option, logCorruptionPolicy);
 } catch (IllegalAccessException e) {
 throw new IllegalStateException("Failed to build " + dir, e);
 } catch (InvocationTargetException e) {
Expand Down

9 changes: 5 additions & 4 deletions
ratis-server/src/main/java/org/apache/ratis/server/impl/RaftServerImpl.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -189,7 +189,8 @@ public long[] getFollowerNextIndices() {

 private final AtomicBoolean firstElectionSinceStartup = new AtomicBoolean(true);

 RaftServerImpl(RaftGroup group, StateMachine stateMachine, RaftServerProxy proxy) throws IOException {
 RaftServerImpl(RaftGroup group, StateMachine stateMachine, RaftServerProxy proxy, RaftStorage.StartupOption option)
 throws IOException {
 final RaftPeerId id = proxy.getId();
 LOG.info("{}: new RaftServerImpl for {} with {}", id, group, stateMachine);
 this.lifeCycle = new LifeCycle(id);
Expand All@@ -202,7 +203,7 @@ public long[] getFollowerNextIndices() {
 this.sleepDeviationThreshold = RaftServerConfigKeys.sleepDeviationThreshold(properties);
 this.proxy = proxy;

 this.state = new ServerState(id, group, properties, this, stateMachine);
 this.state = new ServerState(id, group, stateMachine, this, option, properties);
 this.retryCache = new RetryCacheImpl(properties);
 this.dataStreamMap = new DataStreamMapImpl(id);

Expand DownExpand Up@@ -575,8 +576,8 @@ public Collection<CommitInfoProto> getCommitInfos() {
 }

 GroupInfoReply getGroupInfo(GroupInfoRequest request) {
return new GroupInfoReply(request, getCommitInfos(),
 getGroup(), getRoleInfoProto(), state.getStorage().getStorageDir().isHealthy());
final RaftStorageDirectory dir = state.getStorage().getStorageDir();
return new GroupInfoReply(request, getCommitInfos(), getGroup(), getRoleInfoProto(), dir.isHealthy());
 }

 RoleInfoProto getRoleInfoProto() {
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
RATIS-1677. Do not auto format RaftStorage in RECOVER.#718

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

szetszwo
merged 3 commits into

from

Aug 26, 2022
 Merged


RATIS-1677. Do not auto format RaftStorage in RECOVER.
#718
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
542eb08

RATIS-1677. Do not auto format RaftStorage in RECOVER.


szetszwo Aug 19, 2022
252fa19

Address review comments.


szetszwo Aug 24, 2022
8012c4e

Remove the vol from dirsPerVol.


szetszwo Aug 25, 2022

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


12 changes: 10 additions & 2 deletions
ratis-client/src/main/java/org/apache/ratis/client/api/GroupManagementApi.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,8 +29,16 @@
 * APIs to support group management operations such as add, remove, list and info to a particular server.
 */
public interface GroupManagementApi {
 /** Add a new group. */
 RaftClientReply add(RaftGroup newGroup) throws IOException;
 /**
 * Add a new group.
 * @param format Should it format the storage?
 */
 RaftClientReply add(RaftGroup newGroup, boolean format) throws IOException;

 /** The same as add(newGroup, true). */
 default RaftClientReply add(RaftGroup newGroup) throws IOException {
 return add(newGroup, true);
 }

 /** Remove a group. */
 RaftClientReply remove(RaftGroupId groupId, boolean deleteDirectory, boolean renameDirectory) throws IOException;
Expand Down

9 changes: 6 additions & 3 deletions
ratis-client/src/main/java/org/apache/ratis/client/impl/ClientProtoUtils.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -571,8 +571,9 @@ static GroupManagementRequest toGroupManagementRequest(GroupManagementRequestPro
 final RaftPeerId serverId = RaftPeerId.valueOf(m.getReplyId());
 switch(p.getOpCase()) {
 case GROUPADD:
 final GroupAddRequestProto add = p.getGroupAdd();
 return GroupManagementRequest.newAdd(clientId, serverId, m.getCallId(),
 ProtoUtils.toRaftGroup(p.getGroupAdd().getGroup()));
 ProtoUtils.toRaftGroup(add.getGroup()), add.getFormat());
 case GROUPREMOVE:
 final GroupRemoveRequestProto remove = p.getGroupRemove();
 return GroupManagementRequest.newRemove(clientId, serverId, m.getCallId(),
Expand DownExpand Up@@ -609,8 +610,10 @@ static GroupManagementRequestProto toGroupManagementRequestProto(GroupManagement
 .setRpcRequest(toRaftRpcRequestProtoBuilder(request));
 final GroupManagementRequest.Add add = request.getAdd();
 if (add != null) {
 b.setGroupAdd(GroupAddRequestProto.newBuilder().setGroup(
 ProtoUtils.toRaftGroupProtoBuilder(add.getGroup())).build());
 b.setGroupAdd(GroupAddRequestProto.newBuilder()
 .setGroup(ProtoUtils.toRaftGroupProtoBuilder(add.getGroup()))
 .setFormat(add.isFormat())
 .build());
 }
 final GroupManagementRequest.Remove remove = request.getRemove();
 if (remove != null) {
Expand Down

4 changes: 2 additions & 2 deletions
ratis-client/src/main/java/org/apache/ratis/client/impl/GroupManagementImpl.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -43,13 +43,13 @@ class GroupManagementImpl implements GroupManagementApi {
 }

 @Override
 public RaftClientReply add(RaftGroup newGroup) throws IOException {
 public RaftClientReply add(RaftGroup newGroup, boolean format) throws IOException {
 Objects.requireNonNull(newGroup, "newGroup == null");

 final long callId = CallId.getAndIncrement();
 client.getClientRpc().addRaftPeers(newGroup.getPeers());
 return client.io().sendRequestWithRetry(
 () -> GroupManagementRequest.newAdd(client.getId(), server, callId, newGroup));
 () -> GroupManagementRequest.newAdd(client.getId(), server, callId, newGroup, format));
 }

 @Override
Expand Down

13 changes: 10 additions & 3 deletions
ratis-common/src/main/java/org/apache/ratis/protocol/GroupManagementRequest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,9 +26,11 @@ public abstract static class Op {

 public static class Add extends Op {
 private final RaftGroup group;
 private final boolean format;

 public Add(RaftGroup group) {
 public Add(RaftGroup group, boolean format) {
 this.group = group;
 this.format = format;
 }

 @Override
Expand All@@ -40,6 +42,10 @@ public RaftGroup getGroup() {
 return group;
 }

 public boolean isFormat() {
 return format;
 }

 @Override
 public String toString() {
 return JavaUtils.getClassSimpleName(getClass()) + ":" + getGroup();
Expand DownExpand Up@@ -79,8 +85,9 @@ public String toString() {
 }
 }

 public static GroupManagementRequest newAdd(ClientId clientId, RaftPeerId serverId, long callId, RaftGroup group) {
 return new GroupManagementRequest(clientId, serverId, callId, new Add(group));
 public static GroupManagementRequest newAdd(ClientId clientId, RaftPeerId serverId, long callId,
 RaftGroup group, boolean format) {
 return new GroupManagementRequest(clientId, serverId, callId, new Add(group, format));
 }

 public static GroupManagementRequest newRemove(ClientId clientId, RaftPeerId serverId, long callId,
Expand Down

90 changes: 90 additions & 0 deletions
ratis-common/src/main/java/org/apache/ratis/util/MemoizedCheckedSupplier.java

View file


Open in desktop

Original file line numberDiff line numberDiff 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.ratis.util;

import org.apache.ratis.util.function.CheckedSupplier;

import java.util.Objects;

/**
 * A memoized supplier is a {@link CheckedSupplier}
 * which gets a value by invoking its initializer once.
 * and then keeps returning the same value as its supplied results.
 *
 * This class is thread safe.
 *
 * @param <RETURN> The return type of the supplier.
 * @param <THROW> The throwable type of the supplier.
 */
public final class MemoizedCheckedSupplier<RETURN, THROW extends Throwable>
 implements CheckedSupplier<RETURN, THROW> {
 /**
 * @param supplier to supply at most one non-null value.
 * @return a {@link MemoizedCheckedSupplier} with the given supplier.
 */
 public static <RETURN, THROW extends Throwable> MemoizedCheckedSupplier<RETURN, THROW> valueOf(
 CheckedSupplier<RETURN, THROW> supplier) {
 return supplier instanceof MemoizedCheckedSupplier ?
 (MemoizedCheckedSupplier<RETURN, THROW>) supplier : new MemoizedCheckedSupplier<>(supplier);
 }

 private final CheckedSupplier<RETURN, THROW> initializer;
 private volatile RETURN value = null;

 /**
 * Create a memoized supplier.
 * @param initializer to supply at most one non-null value.
 */
 private MemoizedCheckedSupplier(CheckedSupplier<RETURN, THROW> initializer) {
 Objects.requireNonNull(initializer, "initializer == null");
 this.initializer = initializer;
 }

 /** @return the lazily initialized object. */
 @Override
 public RETURN get() throws THROW {
 RETURN v = value;
 if (v == null) {
 synchronized (this) {
 v = value;
 if (v == null) {
 v = value = Objects.requireNonNull(initializer.get(), "initializer.get() returns null");
 }
 }
 }
 return v;
 }

 /**
 * @return the already initialized object.
 * @throws NullPointerException if the object is uninitialized.
 */
 public RETURN getUnchecked() {
 return Objects.requireNonNull(value, "value == null");
 }

 /** @return is the object initialized? */
 public boolean isInitialized() {
 return value != null;
 }

 @Override
 public String toString() {
 return isInitialized()? "Memoized:" + value: "UNINITIALIZED";
 }
}

5 changes: 5 additions & 0 deletions
ratis-common/src/main/java/org/apache/ratis/util/Preconditions.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,7 @@

import java.util.Collections;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
import java.util.function.Supplier;

Expand DownExpand Up@@ -113,6 +114,10 @@ static <T> T assertInstanceOf(Object object, Class<T> clazz) {
 return clazz.cast(object);
 }

 static <K, V> void assertEmpty(Map<K, V> map, Object name) {
 assertTrue(map.isEmpty(), () -> "The " + name + " map is non-empty: " + map);
 }

 static <T> void assertUnique(Iterable<T> first) {
 assertUnique(first, Collections.emptyList());
 }
Expand Down

1 change: 1 addition & 0 deletions
ratis-common/src/main/java/org/apache/ratis/util/SizeInBytes.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,7 @@
 * Size which may be constructed with a {@link TraditionalBinaryPrefix}.
 */
public final class SizeInBytes {
 public static final SizeInBytes ZERO = valueOf(0);
 public static final SizeInBytes ONE_KB = valueOf("1k");
 public static final SizeInBytes ONE_MB = valueOf("1m");

Expand Down

1 change: 1 addition & 0 deletions
ratis-proto/src/main/proto/Raft.proto

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -469,6 +469,7 @@ message StartLeaderElectionReplyProto {
// A request to add a new group
message GroupAddRequestProto {
 RaftGroupProto group = 1; // the group to be added.
 bool format = 2; // Should it format the storage?
}

message GroupRemoveRequestProto {
Expand Down

16 changes: 12 additions & 4 deletions
ratis-server-api/src/main/java/org/apache/ratis/server/RaftServer.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -167,8 +167,8 @@ class Builder {

 private static Method initNewRaftServerMethod() {
 final String className = RaftServer.class.getPackage().getName() + ".impl.ServerImplUtils";
 final Class<?>[] argClasses = {RaftPeerId.class, RaftGroup.class, StateMachine.Registry.class,
 RaftProperties.class, Parameters.class};
 final Class<?>[] argClasses = {RaftPeerId.class, RaftGroup.class, RaftStorage.StartupOption.class,
StateMachine.Registry.class, RaftProperties.class, Parameters.class};
 try {
 final Class<?> clazz = ReflectionUtils.getClassByName(className);
 return clazz.getMethod("newRaftServer", argClasses);
Expand All@@ -177,12 +177,12 @@ private static Method initNewRaftServerMethod() {
 }
 }

 private static RaftServer newRaftServer(RaftPeerId serverId, RaftGroup group,
 private static RaftServer newRaftServer(RaftPeerId serverId, RaftGroup group, RaftStorage.StartupOption option,
 StateMachine.Registry stateMachineRegistry, RaftProperties properties, Parameters parameters)
 throws IOException {
 try {
 return (RaftServer) NEW_RAFT_SERVER_METHOD.invoke(null,
 serverId, group, stateMachineRegistry, properties, parameters);
 serverId, group, option, stateMachineRegistry, properties, parameters);
 } catch (IllegalAccessException e) {
 throw new IllegalStateException("Failed to build " + serverId, e);
 } catch (InvocationTargetException e) {
Expand All@@ -193,6 +193,7 @@ private static RaftServer newRaftServer(RaftPeerId serverId, RaftGroup group,
 private RaftPeerId serverId;
 private StateMachine.Registry stateMachineRegistry ;
 private RaftGroup group = null;
 private RaftStorage.StartupOption option = RaftStorage.StartupOption.RECOVER;
 private RaftProperties properties;
 private Parameters parameters;

Expand All@@ -201,6 +202,7 @@ public RaftServer build() throws IOException {
 return newRaftServer(
 serverId,
 group,
 option,
 Objects.requireNonNull(stateMachineRegistry , "Neither 'stateMachine' nor 'setStateMachineRegistry' " +
 "is initialized."),
 Objects.requireNonNull(properties, "The 'properties' field is not initialized."),
Expand DownExpand Up@@ -230,6 +232,12 @@ public Builder setGroup(RaftGroup group) {
 return this;
 }

 /** Set the startup option for the group. */
 public Builder setOption(RaftStorage.StartupOption option) {
 this.option = option;
 return this;
 }

 /** Set {@link RaftProperties}. */
 public Builder setProperties(RaftProperties properties) {
 this.properties = properties;
Expand Down

5 changes: 2 additions & 3 deletions
ratis-server-api/src/main/java/org/apache/ratis/server/storage/RaftStorage.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -62,8 +62,7 @@ class Builder {

 private static Method initNewRaftStorageMethod() {
 final String className = RaftStorage.class.getPackage().getName() + ".StorageImplUtils";
 //final String className = "org.apache.ratis.server.storage.RaftStorageImpl";
 final Class<?>[] argClasses = { File.class, CorruptionPolicy.class, StartupOption.class, long.class };
 final Class<?>[] argClasses = {File.class, SizeInBytes.class, StartupOption.class, CorruptionPolicy.class};
 try {
 final Class<?> clazz = ReflectionUtils.getClassByName(className);
 return clazz.getMethod("newRaftStorage", argClasses);
Expand All@@ -76,7 +75,7 @@ private static RaftStorage newRaftStorage(File dir, CorruptionPolicy logCorrupti
 StartupOption option, SizeInBytes storageFreeSpaceMin) throws IOException {
 try {
 return (RaftStorage) NEW_RAFT_STORAGE_METHOD.invoke(null,
 dir, logCorruptionPolicy, option, storageFreeSpaceMin.getSize());
 dir, storageFreeSpaceMin, option, logCorruptionPolicy);
 } catch (IllegalAccessException e) {
 throw new IllegalStateException("Failed to build " + dir, e);
 } catch (InvocationTargetException e) {
Expand Down

9 changes: 5 additions & 4 deletions
ratis-server/src/main/java/org/apache/ratis/server/impl/RaftServerImpl.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -189,7 +189,8 @@ public long[] getFollowerNextIndices() {

 private final AtomicBoolean firstElectionSinceStartup = new AtomicBoolean(true);

 RaftServerImpl(RaftGroup group, StateMachine stateMachine, RaftServerProxy proxy) throws IOException {
 RaftServerImpl(RaftGroup group, StateMachine stateMachine, RaftServerProxy proxy, RaftStorage.StartupOption option)
 throws IOException {
 final RaftPeerId id = proxy.getId();
 LOG.info("{}: new RaftServerImpl for {} with {}", id, group, stateMachine);
 this.lifeCycle = new LifeCycle(id);
Expand All@@ -202,7 +203,7 @@ public long[] getFollowerNextIndices() {
 this.sleepDeviationThreshold = RaftServerConfigKeys.sleepDeviationThreshold(properties);
 this.proxy = proxy;

 this.state = new ServerState(id, group, properties, this, stateMachine);
 this.state = new ServerState(id, group, stateMachine, this, option, properties);
 this.retryCache = new RetryCacheImpl(properties);
 this.dataStreamMap = new DataStreamMapImpl(id);

Expand DownExpand Up@@ -575,8 +576,8 @@ public Collection<CommitInfoProto> getCommitInfos() {
 }

 GroupInfoReply getGroupInfo(GroupInfoRequest request) {
return new GroupInfoReply(request, getCommitInfos(),
 getGroup(), getRoleInfoProto(), state.getStorage().getStorageDir().isHealthy());
final RaftStorageDirectory dir = state.getStorage().getStorageDir();
return new GroupInfoReply(request, getCommitInfos(), getGroup(), getRoleInfoProto(), dir.isHealthy());
 }

 RoleInfoProto getRoleInfoProto() {
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
RATIS-1677. Do not auto format RaftStorage in RECOVER.#718

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

szetszwo
merged 3 commits into

from

Aug 26, 2022
 Merged


RATIS-1677. Do not auto format RaftStorage in RECOVER.
#718
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
542eb08

RATIS-1677. Do not auto format RaftStorage in RECOVER.


szetszwo Aug 19, 2022
252fa19

Address review comments.


szetszwo Aug 24, 2022
8012c4e

Remove the vol from dirsPerVol.


szetszwo Aug 25, 2022

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


12 changes: 10 additions & 2 deletions
ratis-client/src/main/java/org/apache/ratis/client/api/GroupManagementApi.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,8 +29,16 @@
 * APIs to support group management operations such as add, remove, list and info to a particular server.
 */
public interface GroupManagementApi {
 /** Add a new group. */
 RaftClientReply add(RaftGroup newGroup) throws IOException;
 /**
 * Add a new group.
 * @param format Should it format the storage?
 */
 RaftClientReply add(RaftGroup newGroup, boolean format) throws IOException;

 /** The same as add(newGroup, true). */
 default RaftClientReply add(RaftGroup newGroup) throws IOException {
 return add(newGroup, true);
 }

 /** Remove a group. */
 RaftClientReply remove(RaftGroupId groupId, boolean deleteDirectory, boolean renameDirectory) throws IOException;
Expand Down

9 changes: 6 additions & 3 deletions
ratis-client/src/main/java/org/apache/ratis/client/impl/ClientProtoUtils.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -571,8 +571,9 @@ static GroupManagementRequest toGroupManagementRequest(GroupManagementRequestPro
 final RaftPeerId serverId = RaftPeerId.valueOf(m.getReplyId());
 switch(p.getOpCase()) {
 case GROUPADD:
 final GroupAddRequestProto add = p.getGroupAdd();
 return GroupManagementRequest.newAdd(clientId, serverId, m.getCallId(),
 ProtoUtils.toRaftGroup(p.getGroupAdd().getGroup()));
 ProtoUtils.toRaftGroup(add.getGroup()), add.getFormat());
 case GROUPREMOVE:
 final GroupRemoveRequestProto remove = p.getGroupRemove();
 return GroupManagementRequest.newRemove(clientId, serverId, m.getCallId(),
Expand DownExpand Up@@ -609,8 +610,10 @@ static GroupManagementRequestProto toGroupManagementRequestProto(GroupManagement
 .setRpcRequest(toRaftRpcRequestProtoBuilder(request));
 final GroupManagementRequest.Add add = request.getAdd();
 if (add != null) {
 b.setGroupAdd(GroupAddRequestProto.newBuilder().setGroup(
 ProtoUtils.toRaftGroupProtoBuilder(add.getGroup())).build());
 b.setGroupAdd(GroupAddRequestProto.newBuilder()
 .setGroup(ProtoUtils.toRaftGroupProtoBuilder(add.getGroup()))
 .setFormat(add.isFormat())
 .build());
 }
 final GroupManagementRequest.Remove remove = request.getRemove();
 if (remove != null) {
Expand Down

4 changes: 2 additions & 2 deletions
ratis-client/src/main/java/org/apache/ratis/client/impl/GroupManagementImpl.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -43,13 +43,13 @@ class GroupManagementImpl implements GroupManagementApi {
 }

 @Override
 public RaftClientReply add(RaftGroup newGroup) throws IOException {
 public RaftClientReply add(RaftGroup newGroup, boolean format) throws IOException {
 Objects.requireNonNull(newGroup, "newGroup == null");

 final long callId = CallId.getAndIncrement();
 client.getClientRpc().addRaftPeers(newGroup.getPeers());
 return client.io().sendRequestWithRetry(
 () -> GroupManagementRequest.newAdd(client.getId(), server, callId, newGroup));
 () -> GroupManagementRequest.newAdd(client.getId(), server, callId, newGroup, format));
 }

 @Override
Expand Down

13 changes: 10 additions & 3 deletions
ratis-common/src/main/java/org/apache/ratis/protocol/GroupManagementRequest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,9 +26,11 @@ public abstract static class Op {

 public static class Add extends Op {
 private final RaftGroup group;
 private final boolean format;

 public Add(RaftGroup group) {
 public Add(RaftGroup group, boolean format) {
 this.group = group;
 this.format = format;
 }

 @Override
Expand All@@ -40,6 +42,10 @@ public RaftGroup getGroup() {
 return group;
 }

 public boolean isFormat() {
 return format;
 }

 @Override
 public String toString() {
 return JavaUtils.getClassSimpleName(getClass()) + ":" + getGroup();
Expand DownExpand Up@@ -79,8 +85,9 @@ public String toString() {
 }
 }

 public static GroupManagementRequest newAdd(ClientId clientId, RaftPeerId serverId, long callId, RaftGroup group) {
 return new GroupManagementRequest(clientId, serverId, callId, new Add(group));
 public static GroupManagementRequest newAdd(ClientId clientId, RaftPeerId serverId, long callId,
 RaftGroup group, boolean format) {
 return new GroupManagementRequest(clientId, serverId, callId, new Add(group, format));
 }

 public static GroupManagementRequest newRemove(ClientId clientId, RaftPeerId serverId, long callId,
Expand Down

90 changes: 90 additions & 0 deletions
ratis-common/src/main/java/org/apache/ratis/util/MemoizedCheckedSupplier.java

View file


Open in desktop

Original file line numberDiff line numberDiff 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.ratis.util;

import org.apache.ratis.util.function.CheckedSupplier;

import java.util.Objects;

/**
 * A memoized supplier is a {@link CheckedSupplier}
 * which gets a value by invoking its initializer once.
 * and then keeps returning the same value as its supplied results.
 *
 * This class is thread safe.
 *
 * @param <RETURN> The return type of the supplier.
 * @param <THROW> The throwable type of the supplier.
 */
public final class MemoizedCheckedSupplier<RETURN, THROW extends Throwable>
 implements CheckedSupplier<RETURN, THROW> {
 /**
 * @param supplier to supply at most one non-null value.
 * @return a {@link MemoizedCheckedSupplier} with the given supplier.
 */
 public static <RETURN, THROW extends Throwable> MemoizedCheckedSupplier<RETURN, THROW> valueOf(
 CheckedSupplier<RETURN, THROW> supplier) {
 return supplier instanceof MemoizedCheckedSupplier ?
 (MemoizedCheckedSupplier<RETURN, THROW>) supplier : new MemoizedCheckedSupplier<>(supplier);
 }

 private final CheckedSupplier<RETURN, THROW> initializer;
 private volatile RETURN value = null;

 /**
 * Create a memoized supplier.
 * @param initializer to supply at most one non-null value.
 */
 private MemoizedCheckedSupplier(CheckedSupplier<RETURN, THROW> initializer) {
 Objects.requireNonNull(initializer, "initializer == null");
 this.initializer = initializer;
 }

 /** @return the lazily initialized object. */
 @Override
 public RETURN get() throws THROW {
 RETURN v = value;
 if (v == null) {
 synchronized (this) {
 v = value;
 if (v == null) {
 v = value = Objects.requireNonNull(initializer.get(), "initializer.get() returns null");
 }
 }
 }
 return v;
 }

 /**
 * @return the already initialized object.
 * @throws NullPointerException if the object is uninitialized.
 */
 public RETURN getUnchecked() {
 return Objects.requireNonNull(value, "value == null");
 }

 /** @return is the object initialized? */
 public boolean isInitialized() {
 return value != null;
 }

 @Override
 public String toString() {
 return isInitialized()? "Memoized:" + value: "UNINITIALIZED";
 }
}

5 changes: 5 additions & 0 deletions
ratis-common/src/main/java/org/apache/ratis/util/Preconditions.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,7 @@

import java.util.Collections;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
import java.util.function.Supplier;

Expand DownExpand Up@@ -113,6 +114,10 @@ static <T> T assertInstanceOf(Object object, Class<T> clazz) {
 return clazz.cast(object);
 }

 static <K, V> void assertEmpty(Map<K, V> map, Object name) {
 assertTrue(map.isEmpty(), () -> "The " + name + " map is non-empty: " + map);
 }

 static <T> void assertUnique(Iterable<T> first) {
 assertUnique(first, Collections.emptyList());
 }
Expand Down

1 change: 1 addition & 0 deletions
ratis-common/src/main/java/org/apache/ratis/util/SizeInBytes.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,7 @@
 * Size which may be constructed with a {@link TraditionalBinaryPrefix}.
 */
public final class SizeInBytes {
 public static final SizeInBytes ZERO = valueOf(0);
 public static final SizeInBytes ONE_KB = valueOf("1k");
 public static final SizeInBytes ONE_MB = valueOf("1m");

Expand Down

1 change: 1 addition & 0 deletions
ratis-proto/src/main/proto/Raft.proto

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -469,6 +469,7 @@ message StartLeaderElectionReplyProto {
// A request to add a new group
message GroupAddRequestProto {
 RaftGroupProto group = 1; // the group to be added.
 bool format = 2; // Should it format the storage?
}

message GroupRemoveRequestProto {
Expand Down

16 changes: 12 additions & 4 deletions
ratis-server-api/src/main/java/org/apache/ratis/server/RaftServer.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -167,8 +167,8 @@ class Builder {

 private static Method initNewRaftServerMethod() {
 final String className = RaftServer.class.getPackage().getName() + ".impl.ServerImplUtils";
 final Class<?>[] argClasses = {RaftPeerId.class, RaftGroup.class, StateMachine.Registry.class,
 RaftProperties.class, Parameters.class};
 final Class<?>[] argClasses = {RaftPeerId.class, RaftGroup.class, RaftStorage.StartupOption.class,
StateMachine.Registry.class, RaftProperties.class, Parameters.class};
 try {
 final Class<?> clazz = ReflectionUtils.getClassByName(className);
 return clazz.getMethod("newRaftServer", argClasses);
Expand All@@ -177,12 +177,12 @@ private static Method initNewRaftServerMethod() {
 }
 }

 private static RaftServer newRaftServer(RaftPeerId serverId, RaftGroup group,
 private static RaftServer newRaftServer(RaftPeerId serverId, RaftGroup group, RaftStorage.StartupOption option,
 StateMachine.Registry stateMachineRegistry, RaftProperties properties, Parameters parameters)
 throws IOException {
 try {
 return (RaftServer) NEW_RAFT_SERVER_METHOD.invoke(null,
 serverId, group, stateMachineRegistry, properties, parameters);
 serverId, group, option, stateMachineRegistry, properties, parameters);
 } catch (IllegalAccessException e) {
 throw new IllegalStateException("Failed to build " + serverId, e);
 } catch (InvocationTargetException e) {
Expand All@@ -193,6 +193,7 @@ private static RaftServer newRaftServer(RaftPeerId serverId, RaftGroup group,
 private RaftPeerId serverId;
 private StateMachine.Registry stateMachineRegistry ;
 private RaftGroup group = null;
 private RaftStorage.StartupOption option = RaftStorage.StartupOption.RECOVER;
 private RaftProperties properties;
 private Parameters parameters;

Expand All@@ -201,6 +202,7 @@ public RaftServer build() throws IOException {
 return newRaftServer(
 serverId,
 group,
 option,
 Objects.requireNonNull(stateMachineRegistry , "Neither 'stateMachine' nor 'setStateMachineRegistry' " +
 "is initialized."),
 Objects.requireNonNull(properties, "The 'properties' field is not initialized."),
Expand DownExpand Up@@ -230,6 +232,12 @@ public Builder setGroup(RaftGroup group) {
 return this;
 }

 /** Set the startup option for the group. */
 public Builder setOption(RaftStorage.StartupOption option) {
 this.option = option;
 return this;
 }

 /** Set {@link RaftProperties}. */
 public Builder setProperties(RaftProperties properties) {
 this.properties = properties;
Expand Down

5 changes: 2 additions & 3 deletions
ratis-server-api/src/main/java/org/apache/ratis/server/storage/RaftStorage.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -62,8 +62,7 @@ class Builder {

 private static Method initNewRaftStorageMethod() {
 final String className = RaftStorage.class.getPackage().getName() + ".StorageImplUtils";
 //final String className = "org.apache.ratis.server.storage.RaftStorageImpl";
 final Class<?>[] argClasses = { File.class, CorruptionPolicy.class, StartupOption.class, long.class };
 final Class<?>[] argClasses = {File.class, SizeInBytes.class, StartupOption.class, CorruptionPolicy.class};
 try {
 final Class<?> clazz = ReflectionUtils.getClassByName(className);
 return clazz.getMethod("newRaftStorage", argClasses);
Expand All@@ -76,7 +75,7 @@ private static RaftStorage newRaftStorage(File dir, CorruptionPolicy logCorrupti
 StartupOption option, SizeInBytes storageFreeSpaceMin) throws IOException {
 try {
 return (RaftStorage) NEW_RAFT_STORAGE_METHOD.invoke(null,
 dir, logCorruptionPolicy, option, storageFreeSpaceMin.getSize());
 dir, storageFreeSpaceMin, option, logCorruptionPolicy);
 } catch (IllegalAccessException e) {
 throw new IllegalStateException("Failed to build " + dir, e);
 } catch (InvocationTargetException e) {
Expand Down

9 changes: 5 additions & 4 deletions
ratis-server/src/main/java/org/apache/ratis/server/impl/RaftServerImpl.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -189,7 +189,8 @@ public long[] getFollowerNextIndices() {

 private final AtomicBoolean firstElectionSinceStartup = new AtomicBoolean(true);

 RaftServerImpl(RaftGroup group, StateMachine stateMachine, RaftServerProxy proxy) throws IOException {
 RaftServerImpl(RaftGroup group, StateMachine stateMachine, RaftServerProxy proxy, RaftStorage.StartupOption option)
 throws IOException {
 final RaftPeerId id = proxy.getId();
 LOG.info("{}: new RaftServerImpl for {} with {}", id, group, stateMachine);
 this.lifeCycle = new LifeCycle(id);
Expand All@@ -202,7 +203,7 @@ public long[] getFollowerNextIndices() {
 this.sleepDeviationThreshold = RaftServerConfigKeys.sleepDeviationThreshold(properties);
 this.proxy = proxy;

 this.state = new ServerState(id, group, properties, this, stateMachine);
 this.state = new ServerState(id, group, stateMachine, this, option, properties);
 this.retryCache = new RetryCacheImpl(properties);
 this.dataStreamMap = new DataStreamMapImpl(id);

Expand DownExpand Up@@ -575,8 +576,8 @@ public Collection<CommitInfoProto> getCommitInfos() {
 }

 GroupInfoReply getGroupInfo(GroupInfoRequest request) {
return new GroupInfoReply(request, getCommitInfos(),
 getGroup(), getRoleInfoProto(), state.getStorage().getStorageDir().isHealthy());
final RaftStorageDirectory dir = state.getStorage().getStorageDir();
return new GroupInfoReply(request, getCommitInfos(), getGroup(), getRoleInfoProto(), dir.isHealthy());
 }

 RoleInfoProto getRoleInfoProto() {
Expand Down
Loading