Maxwell-Guo commented on code in PR #2531:
URL: https://github.com/apache/cassandra/pull/2531#discussion_r1302355322
##########
src/java/org/apache/cassandra/tools/nodetool/Repair.java:
##########
@@ -149,7 +149,7 @@ else if (dcParallel)
parallelismDegree = RepairParallelism.DATACENTER_AWARE;
options.put(RepairOption.PARALLELISM_KEY,
parallelismDegree.getName());
options.put(RepairOption.PRIMARY_RANGE_KEY,
Boolean.toString(primaryRange));
- options.put(RepairOption.INCREMENTAL_KEY,
Boolean.toString(!fullRepair));
+ options.put(RepairOption.INCREMENTAL_KEY,
Boolean.toString(!(fullRepair || (paxosOnly && getPreviewKind() ==
PreviewKind.NONE))));
Review Comment:
what about change this to `options.put(RepairOption.INCREMENTAL_KEY,
Boolean.toString(!fullRepair && !(paxosOnly && getPreviewKind() ==
PreviewKind.NONE)));`
seems more readable。
##########
test/unit/org/apache/cassandra/tools/NodeToolCommandTest.java:
##########
@@ -0,0 +1,85 @@
+/*
+ * 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.cassandra.tools;
+
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.Map;
+
+import org.apache.commons.lang3.ArrayUtils;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
+import org.apache.cassandra.repair.messages.RepairOption;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Mockito;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+public class NodeToolCommandTest
+{
+ final NodeProbe nodeProbe = Mockito.mock(NodeProbe.class);
+ final Output output = Output.CONSOLE;
+
+ final NodeProbeFactory repairNodeFactory = new NodeProbeFactory()
+ {
+ @Override
+ public NodeProbe create(String host, int port) throws IOException
+ {
+ return nodeProbe;
+ }
+
+ @Override
+ public NodeProbe create(String host, int port, String username, String
password) throws IOException
+ {
+ return nodeProbe;
+ }
+ };
+
+
+ @Before
+ public void beforeTest()
+ {
+ Mockito.reset(nodeProbe);
+ when(nodeProbe.getKeyspaces()).thenReturn(Arrays.asList("ks"));
+
when(nodeProbe.getNonSystemKeyspaces()).thenReturn(Arrays.asList("ks"));
+ when(nodeProbe.output()).thenReturn(output);
+ }
+
+ private Map<String, String> testRepairCommand(int expectedExitCode, String
...args) throws IOException
Review Comment:
it seems this ut can only test the return result of the option ,and can not
ensure that this fix really start a paxos-only repair?
##########
src/java/org/apache/cassandra/tools/nodetool/Repair.java:
##########
@@ -149,7 +149,7 @@ else if (dcParallel)
parallelismDegree = RepairParallelism.DATACENTER_AWARE;
options.put(RepairOption.PARALLELISM_KEY,
parallelismDegree.getName());
options.put(RepairOption.PRIMARY_RANGE_KEY,
Boolean.toString(primaryRange));
- options.put(RepairOption.INCREMENTAL_KEY,
Boolean.toString(!fullRepair));
+ options.put(RepairOption.INCREMENTAL_KEY,
Boolean.toString(!(fullRepair || (paxosOnly && getPreviewKind() ==
PreviewKind.NONE))));
Review Comment:
what about change this to `options.put(RepairOption.INCREMENTAL_KEY,
Boolean.toString(!fullRepair && !(paxosOnly && getPreviewKind() ==
PreviewKind.NONE)));`
seems more readable。
##########
test/unit/org/apache/cassandra/tools/NodeToolCommandTest.java:
##########
@@ -0,0 +1,85 @@
+/*
+ * 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.cassandra.tools;
+
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.Map;
+
+import org.apache.commons.lang3.ArrayUtils;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
+import org.apache.cassandra.repair.messages.RepairOption;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Mockito;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+public class NodeToolCommandTest
Review Comment:
Besides, what about change the Class name to PaxosOnlyRepairCommandTest or
something else ,as this test only test one command of paxos-only
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
