Skip to content

Commit f9f6971

Browse files
jaydeepkumar1984jaydeep1984
jaydeepkumar1984
authored and
jaydeep1984
committed
Rename AutoRepair --> UnifiedRepair
1 parent c6bd7df commit f9f6971

50 files changed

Lines changed: 1122 additions & 1122 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎doc/modules/cassandra/pages/managing/operating/metrics.adoc‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1078,16 +1078,16 @@ partitions processed per logged batch
10781078
partitions processed per unlogged batch
10791079
|===
10801080

1081-
== Automated Repair Metrics
1081+
== Unified Repair Metrics
10821082

1083-
Metrics specifc to automated repair.
1083+
Metrics specifc to unified repair.
10841084

10851085
Reported name format:
10861086

10871087
*Metric Name*::
1088-
`org.apache.cassandra.metrics.AutoRepair.<MetricName>`
1088+
`org.apache.cassandra.metrics.UnifiedRepair.<MetricName>`
10891089
*JMX MBean*::
1090-
`org.apache.cassandra.metrics:type=AutoRepair name=<MetricName> repairType=<RepairType>`
1090+
`org.apache.cassandra.metrics:type=UnifiedRepair name=<MetricName> repairType=<RepairType>`
10911091

10921092
[cols=",,",options="header",]
10931093
|===
@@ -1118,15 +1118,15 @@ on the node
11181118
views considered on the node
11191119

11201120
|TotalDisabledRepairTables |Gauge<Integer> |Number of tables on which
1121-
the automated repair has been disabled on the node
1121+
the unified repair has been disabled on the node
11221122

11231123
|RepairTurnMyTurn |Counter |Represents the node's turn to repair
11241124

11251125
|RepairTurnMyTurnDueToPriority |Counter |Represents the node's turn to repair
1126-
due to priority set in the automated repair
1126+
due to priority set in the unified repair
11271127

11281128
|RepairTurnMyTurnForceRepair |Counter |Represents the node's turn to repair
1129-
due to force repair set in the automated repair
1129+
due to force repair set in the unified repair
11301130

11311131

11321132
|===

‎src/java/org/apache/cassandra/config/Config.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
import com.google.common.collect.ImmutableSet;
3434
import com.google.common.collect.Sets;
3535

36-
import org.apache.cassandra.repair.autorepair.AutoRepairConfig;
36+
import org.apache.cassandra.repair.unifiedrepair.UnifiedRepairConfig;
3737
import org.slf4j.Logger;
3838
import org.slf4j.LoggerFactory;
3939

@@ -957,7 +957,7 @@ public static void setClientMode(boolean clientMode)
957957

958958
public volatile boolean password_validator_reconfiguration_enabled = true;
959959
public volatile CustomGuardrailConfig password_validator = new CustomGuardrailConfig();
960-
public volatile AutoRepairConfig auto_repair = new AutoRepairConfig();
960+
public volatile UnifiedRepairConfig unified_repair = new UnifiedRepairConfig();
961961

962962
/**
963963
* The variants of paxos implementation and semantics supported by Cassandra.

‎src/java/org/apache/cassandra/config/DatabaseDescriptor.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@
107107
import org.apache.cassandra.locator.InetAddressAndPort;
108108
import org.apache.cassandra.locator.Replica;
109109
import org.apache.cassandra.locator.SeedProvider;
110-
import org.apache.cassandra.repair.autorepair.AutoRepairConfig;
110+
import org.apache.cassandra.repair.unifiedrepair.UnifiedRepairConfig;
111111
import org.apache.cassandra.security.AbstractCryptoProvider;
112112
import org.apache.cassandra.security.EncryptionContext;
113113
import org.apache.cassandra.security.JREProvider;
@@ -5361,9 +5361,9 @@ public static boolean isPasswordValidatorReconfigurationEnabled()
53615361
return conf.password_validator_reconfiguration_enabled;
53625362
}
53635363

5364-
public static AutoRepairConfig getAutoRepairConfig()
5364+
public static UnifiedRepairConfig getUnifiedRepairConfig()
53655365
{
5366-
return conf.auto_repair;
5366+
return conf.unified_repair;
53675367
}
53685368

53695369
public static double getIncrementalRepairDiskHeadroomRejectRatio()

‎src/java/org/apache/cassandra/cql3/statements/schema/TableAttributes.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@
2525

2626
import org.apache.cassandra.cql3.statements.PropertyDefinitions;
2727
import org.apache.cassandra.exceptions.ConfigurationException;
28-
import org.apache.cassandra.repair.autorepair.AutoRepairConfig;
29-
import org.apache.cassandra.schema.AutoRepairParams;
28+
import org.apache.cassandra.repair.unifiedrepair.UnifiedRepairConfig;
29+
import org.apache.cassandra.schema.UnifiedRepairParams;
3030
import org.apache.cassandra.schema.CachingParams;
3131
import org.apache.cassandra.schema.CompactionParams;
3232
import org.apache.cassandra.schema.CompressionParams;
@@ -154,10 +154,10 @@ private TableParams build(TableParams.Builder builder)
154154
builder.readRepair(ReadRepairStrategy.fromString(getString(READ_REPAIR)));
155155

156156
if (hasOption(Option.REPAIR_FULL))
157-
builder.automatedRepairFull(AutoRepairParams.fromMap(AutoRepairConfig.RepairType.full, getMap(Option.REPAIR_FULL)));
157+
builder.unifiedRepairFull(UnifiedRepairParams.fromMap(UnifiedRepairConfig.RepairType.full, getMap(Option.REPAIR_FULL)));
158158

159159
if (hasOption(Option.REPAIR_INCREMENTAL))
160-
builder.automatedRepairIncremental(AutoRepairParams.fromMap(AutoRepairConfig.RepairType.incremental, getMap(Option.REPAIR_INCREMENTAL)));
160+
builder.unifiedRepairIncremental(UnifiedRepairParams.fromMap(UnifiedRepairConfig.RepairType.incremental, getMap(Option.REPAIR_INCREMENTAL)));
161161

162162
return builder.build();
163163
}

‎src/java/org/apache/cassandra/metrics/CassandraMetricsRegistry.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ public class CassandraMetricsRegistry extends MetricRegistry
150150
.add(ThreadPoolMetrics.TYPE_NAME)
151151
.add(TrieMemtableMetricsView.TYPE_NAME)
152152
.add(UnweightedCacheMetrics.TYPE_NAME)
153-
.add(AutoRepairMetrics.TYPE_NAME)
153+
.add(UnifiedRepairMetrics.TYPE_NAME)
154154
.build();
155155
}
156156

src/java/org/apache/cassandra/metrics/AutoRepairMetrics.java renamed to src/java/org/apache/cassandra/metrics/UnifiedRepairMetrics.java

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -20,19 +20,19 @@
2020
import com.codahale.metrics.Counter;
2121
import com.codahale.metrics.Gauge;
2222
import com.google.common.annotations.VisibleForTesting;
23-
import org.apache.cassandra.repair.autorepair.AutoRepairConfig.RepairType;
24-
import org.apache.cassandra.repair.autorepair.AutoRepairUtils;
25-
import org.apache.cassandra.repair.autorepair.AutoRepair;
23+
import org.apache.cassandra.repair.unifiedrepair.UnifiedRepairConfig.RepairType;
24+
import org.apache.cassandra.repair.unifiedrepair.UnifiedRepairUtils;
25+
import org.apache.cassandra.repair.unifiedrepair.UnifiedRepair;
2626

2727
import static org.apache.cassandra.metrics.CassandraMetricsRegistry.Metrics;
2828
import static org.apache.cassandra.utils.LocalizeString.toLowerCaseLocalized;
2929

3030
/**
31-
* Metrics related to AutoRepair.
31+
* Metrics related to UnifiedRepair.
3232
*/
33-
public class AutoRepairMetrics
33+
public class UnifiedRepairMetrics
3434
{
35-
public static final String TYPE_NAME = "autorepair";
35+
public static final String TYPE_NAME = "unifiedrepair";
3636
public Gauge<Integer> repairsInProgress;
3737
public Gauge<Integer> nodeRepairTimeInSec;
3838
public Gauge<Integer> clusterRepairTimeInSec;
@@ -47,47 +47,47 @@ public class AutoRepairMetrics
4747
public Gauge<Integer> totalMVTablesConsideredForRepair;
4848
public Gauge<Integer> totalDisabledRepairTables;
4949

50-
public AutoRepairMetrics(RepairType repairType)
50+
public UnifiedRepairMetrics(RepairType repairType)
5151
{
52-
AutoRepairMetricsFactory factory = new AutoRepairMetricsFactory(repairType);
52+
UnifiedRepairMetricsFactory factory = new UnifiedRepairMetricsFactory(repairType);
5353

5454
repairsInProgress = Metrics.register(factory.createMetricName("RepairsInProgress"), new Gauge<Integer>()
5555
{
5656
public Integer getValue()
5757
{
58-
return AutoRepair.instance.getRepairState(repairType).isRepairInProgress() ? 1 : 0;
58+
return UnifiedRepair.instance.getRepairState(repairType).isRepairInProgress() ? 1 : 0;
5959
}
6060
});
6161

6262
nodeRepairTimeInSec = Metrics.register(factory.createMetricName("NodeRepairTimeInSec"), new Gauge<Integer>()
6363
{
6464
public Integer getValue()
6565
{
66-
return AutoRepair.instance.getRepairState(repairType).getNodeRepairTimeInSec();
66+
return UnifiedRepair.instance.getRepairState(repairType).getNodeRepairTimeInSec();
6767
}
6868
});
6969

7070
clusterRepairTimeInSec = Metrics.register(factory.createMetricName("ClusterRepairTimeInSec"), new Gauge<Integer>()
7171
{
7272
public Integer getValue()
7373
{
74-
return AutoRepair.instance.getRepairState(repairType).getClusterRepairTimeInSec();
74+
return UnifiedRepair.instance.getRepairState(repairType).getClusterRepairTimeInSec();
7575
}
7676
});
7777

7878
skippedTokenRangesCount = Metrics.register(factory.createMetricName("SkippedTokenRangesCount"), new Gauge<Integer>()
7979
{
8080
public Integer getValue()
8181
{
82-
return AutoRepair.instance.getRepairState(repairType).getSkippedTokenRangesCount();
82+
return UnifiedRepair.instance.getRepairState(repairType).getSkippedTokenRangesCount();
8383
}
8484
});
8585

8686
skippedTablesCount = Metrics.register(factory.createMetricName("SkippedTablesCount"), new Gauge<Integer>()
8787
{
8888
public Integer getValue()
8989
{
90-
return AutoRepair.instance.getRepairState(repairType).getSkippedTablesCount();
90+
return UnifiedRepair.instance.getRepairState(repairType).getSkippedTablesCount();
9191
}
9292
});
9393

@@ -96,23 +96,23 @@ public Integer getValue()
9696
{
9797
public Integer getValue()
9898
{
99-
return AutoRepair.instance.getRepairState(repairType).getLongestUnrepairedSec();
99+
return UnifiedRepair.instance.getRepairState(repairType).getLongestUnrepairedSec();
100100
}
101101
});
102102

103103
succeededTokenRangesCount = Metrics.register(factory.createMetricName("SucceededTokenRangesCount"), new Gauge<Integer>()
104104
{
105105
public Integer getValue()
106106
{
107-
return AutoRepair.instance.getRepairState(repairType).getSucceededTokenRangesCount();
107+
return UnifiedRepair.instance.getRepairState(repairType).getSucceededTokenRangesCount();
108108
}
109109
});
110110

111111
failedTokenRangesCount = Metrics.register(factory.createMetricName("FailedTokenRangesCount"), new Gauge<Integer>()
112112
{
113113
public Integer getValue()
114114
{
115-
return AutoRepair.instance.getRepairState(repairType).getFailedTokenRangesCount();
115+
return UnifiedRepair.instance.getRepairState(repairType).getFailedTokenRangesCount();
116116
}
117117
});
118118

@@ -124,20 +124,20 @@ public Integer getValue()
124124
{
125125
public Integer getValue()
126126
{
127-
return AutoRepair.instance.getRepairState(repairType).getTotalMVTablesConsideredForRepair();
127+
return UnifiedRepair.instance.getRepairState(repairType).getTotalMVTablesConsideredForRepair();
128128
}
129129
});
130130

131131
totalDisabledRepairTables = Metrics.register(factory.createMetricName("TotalDisabledRepairTables"), new Gauge<Integer>()
132132
{
133133
public Integer getValue()
134134
{
135-
return AutoRepair.instance.getRepairState(repairType).getTotalDisabledTablesRepairCount();
135+
return UnifiedRepair.instance.getRepairState(repairType).getTotalDisabledTablesRepairCount();
136136
}
137137
});
138138
}
139139

140-
public void recordTurn(AutoRepairUtils.RepairTurn turn)
140+
public void recordTurn(UnifiedRepairUtils.RepairTurn turn)
141141
{
142142
switch (turn)
143143
{
@@ -156,13 +156,13 @@ public void recordTurn(AutoRepairUtils.RepairTurn turn)
156156
}
157157

158158
@VisibleForTesting
159-
protected static class AutoRepairMetricsFactory implements MetricNameFactory
159+
protected static class UnifiedRepairMetricsFactory implements MetricNameFactory
160160
{
161-
private static final String TYPE = "AutoRepair";
161+
private static final String TYPE = "UnifiedRepair";
162162
@VisibleForTesting
163163
protected final String repairType;
164164

165-
protected AutoRepairMetricsFactory(RepairType repairType)
165+
protected UnifiedRepairMetricsFactory(RepairType repairType)
166166
{
167167
this.repairType = toLowerCaseLocalized(repairType.toString());
168168
}

src/java/org/apache/cassandra/metrics/AutoRepairMetricsManager.java renamed to src/java/org/apache/cassandra/metrics/UnifiedRepairMetricsManager.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,17 +18,17 @@
1818

1919
package org.apache.cassandra.metrics;
2020

21-
import org.apache.cassandra.repair.autorepair.AutoRepairConfig.RepairType;
21+
import org.apache.cassandra.repair.unifiedrepair.UnifiedRepairConfig.RepairType;
2222

2323
import java.util.Map;
2424
import java.util.concurrent.ConcurrentHashMap;
2525

26-
public class AutoRepairMetricsManager
26+
public class UnifiedRepairMetricsManager
2727
{
28-
private static final Map<RepairType, AutoRepairMetrics> metrics = new ConcurrentHashMap<>();
28+
private static final Map<RepairType, UnifiedRepairMetrics> metrics = new ConcurrentHashMap<>();
2929

30-
public static AutoRepairMetrics getMetrics(RepairType repairType)
30+
public static UnifiedRepairMetrics getMetrics(RepairType repairType)
3131
{
32-
return metrics.computeIfAbsent(repairType, k -> new AutoRepairMetrics(repairType));
32+
return metrics.computeIfAbsent(repairType, k -> new UnifiedRepairMetrics(repairType));
3333
}
3434
}

src/java/org/apache/cassandra/repair/autorepair/DefaultAutoRepairTokenSplitter.java renamed to src/java/org/apache/cassandra/repair/unifiedrepair/DefaultUnifiedRepairTokenSplitter.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,28 +15,28 @@
1515
* See the License for the specific language governing permissions and
1616
* limitations under the License.
1717
*/
18-
package org.apache.cassandra.repair.autorepair;
18+
package org.apache.cassandra.repair.unifiedrepair;
1919

2020

2121
import java.util.ArrayList;
2222
import java.util.Collection;
2323
import java.util.Collections;
2424
import java.util.List;
2525

26-
import org.apache.cassandra.service.AutoRepairService;
26+
import org.apache.cassandra.service.UnifiedRepairService;
2727

2828
import org.apache.cassandra.dht.Range;
2929
import org.apache.cassandra.dht.Token;
3030
import org.apache.cassandra.service.StorageService;
3131

32-
import static org.apache.cassandra.repair.autorepair.AutoRepairUtils.splitEvenly;
32+
import static org.apache.cassandra.repair.unifiedrepair.UnifiedRepairUtils.splitEvenly;
3333

34-
public class DefaultAutoRepairTokenSplitter implements IAutoRepairTokenRangeSplitter
34+
public class DefaultUnifiedRepairTokenSplitter implements IUnifiedRepairTokenRangeSplitter
3535
{
3636
@Override
37-
public List<RepairAssignment> getRepairAssignments(AutoRepairConfig.RepairType repairType, boolean primaryRangeOnly, String keyspaceName, List<String> tableNames)
37+
public List<RepairAssignment> getRepairAssignments(UnifiedRepairConfig.RepairType repairType, boolean primaryRangeOnly, String keyspaceName, List<String> tableNames)
3838
{
39-
AutoRepairConfig config = AutoRepairService.instance.getAutoRepairConfig();
39+
UnifiedRepairConfig config = UnifiedRepairService.instance.getUnifiedRepairConfig();
4040
List<RepairAssignment> repairAssignments = new ArrayList<>();
4141

4242
Collection<Range<Token>> tokens = StorageService.instance.getPrimaryRanges(keyspaceName);

src/java/org/apache/cassandra/repair/autorepair/IAutoRepairTokenRangeSplitter.java renamed to src/java/org/apache/cassandra/repair/unifiedrepair/IUnifiedRepairTokenRangeSplitter.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
* See the License for the specific language governing permissions and
1616
* limitations under the License.
1717
*/
18-
package org.apache.cassandra.repair.autorepair;
18+
package org.apache.cassandra.repair.unifiedrepair;
1919

2020

2121
import java.util.List;
@@ -24,22 +24,22 @@
2424
import org.apache.cassandra.dht.Range;
2525
import org.apache.cassandra.dht.Token;
2626

27-
public interface IAutoRepairTokenRangeSplitter
27+
public interface IUnifiedRepairTokenRangeSplitter
2828
{
2929

3030
/**
3131
* Split the token range you wish to repair into multiple assignments.
32-
* The autorepair framework will repair the list of returned subrange in a sequence.
32+
* The unifiedrepair framework will repair the list of returned subrange in a sequence.
3333
* @param repairType The type of repair being executed
3434
* @param primaryRangeOnly Whether to repair only this node's primary ranges or all of its ranges.
3535
* @param keyspaceName The keyspace being repaired
3636
* @param tableNames The tables to repair
3737
* @return repair assignments broken up by range, keyspace and tables.
3838
*/
39-
List<RepairAssignment> getRepairAssignments(AutoRepairConfig.RepairType repairType, boolean primaryRangeOnly, String keyspaceName, List<String> tableNames);
39+
List<RepairAssignment> getRepairAssignments(UnifiedRepairConfig.RepairType repairType, boolean primaryRangeOnly, String keyspaceName, List<String> tableNames);
4040

4141
/**
42-
* Defines a repair assignment to be issued by the autorepair framework.
42+
* Defines a repair assignment to be issued by the unifiedrepair framework.
4343
*/
4444
class RepairAssignment
4545
{

0 commit comments

Comments
 (0)