Skip to content

Commit c24c441

Browse files
smiklosovicsmiklosovic
committed
rename method parameters to align with changed type name, fix DatabaseDescriptorRefTest
1 parent 05c1bb8 commit c24c441

6 files changed

Lines changed: 43 additions & 43 deletions

File tree

‎src/java/org/apache/cassandra/service/DataResurrectionCheck.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -164,12 +164,12 @@ public boolean isDisabledByDefault()
164164
}
165165

166166
@Override
167-
public void execute(StartupChecksConfiguration options) throws StartupException
167+
public void execute(StartupChecksConfiguration configuration) throws StartupException
168168
{
169-
if (options.isDisabled(name()))
169+
if (configuration.isDisabled(name()))
170170
return;
171171

172-
Map<String, Object> config = options.getConfig(name());
172+
Map<String, Object> config = configuration.getConfig(name());
173173
File heartbeatFile = getHeartbeatFile(config);
174174

175175
if (!heartbeatFile.exists())

‎src/java/org/apache/cassandra/service/FileSystemOwnershipCheck.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -130,15 +130,15 @@ public boolean isDisabledByDefault()
130130
}
131131

132132
@Override
133-
public void execute(StartupChecksConfiguration options) throws StartupException
133+
public void execute(StartupChecksConfiguration configuration) throws StartupException
134134
{
135-
if (!isEnabled(options))
135+
if (!isEnabled(configuration))
136136
{
137137
logger.info("Filesystem ownership check is not enabled.");
138138
return;
139139
}
140140

141-
Map<String, Object> config = options.getConfig(name());
141+
Map<String, Object> config = configuration.getConfig(name());
142142

143143
String expectedToken = constructTokenFromProperties(config);
144144
String tokenFilename = getFsOwnershipFilename(config);

‎src/java/org/apache/cassandra/service/StartupCheck.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,11 +49,11 @@ public interface StartupCheck
4949
* test should log a message regarding the reason for the failure and
5050
* ideally the steps required to remedy the problem.
5151
*
52-
* @param startupChecksOptions all options from descriptor
52+
* @param configuration all options from descriptor
5353
* @throws org.apache.cassandra.exceptions.StartupException if the test determines
5454
* that the environement or system is not in a safe state to startup
5555
*/
56-
void execute(StartupChecksConfiguration startupChecksOptions) throws StartupException;
56+
void execute(StartupChecksConfiguration configuration) throws StartupException;
5757

5858
/**
5959
* Tells whether a startup check can be configured, at the moment via cassandra.yml.

‎src/java/org/apache/cassandra/service/StartupChecks.java‎

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -235,9 +235,9 @@ public String name()
235235
}
236236

237237
@Override
238-
public void execute(StartupChecksConfiguration startupChecksOptions) throws StartupException
238+
public void execute(StartupChecksConfiguration configuration) throws StartupException
239239
{
240-
if (startupChecksOptions.isDisabled(name()))
240+
if (configuration.isDisabled(name()))
241241
return;
242242

243243
if (!FBUtilities.isLinux)
@@ -298,9 +298,9 @@ public String name()
298298
}
299299

300300
@Override
301-
public void execute(StartupChecksConfiguration options)
301+
public void execute(StartupChecksConfiguration configuration)
302302
{
303-
if (options.isDisabled(name()))
303+
if (configuration.isDisabled(name()))
304304
return;
305305

306306
String jemalloc = CassandraRelevantProperties.LIBJEMALLOC.getString();
@@ -322,9 +322,9 @@ public String name()
322322
}
323323

324324
@Override
325-
public void execute(StartupChecksConfiguration options)
325+
public void execute(StartupChecksConfiguration configuration)
326326
{
327-
if (options.isDisabled(name()))
327+
if (configuration.isDisabled(name()))
328328
return;
329329
try
330330
{
@@ -353,9 +353,9 @@ public String name()
353353
private static final long EARLIEST_LAUNCH_DATE = 1215820800000L;
354354

355355
@Override
356-
public void execute(StartupChecksConfiguration options) throws StartupException
356+
public void execute(StartupChecksConfiguration configuration) throws StartupException
357357
{
358-
if (options.isDisabled(name()))
358+
if (configuration.isDisabled(name()))
359359
return;
360360
long now = currentTimeMillis();
361361
if (now < EARLIEST_LAUNCH_DATE)
@@ -374,9 +374,9 @@ public String name()
374374
}
375375

376376
@Override
377-
public void execute(StartupChecksConfiguration options)
377+
public void execute(StartupChecksConfiguration configuration)
378378
{
379-
if (options.isDisabled(name()))
379+
if (configuration.isDisabled(name()))
380380
return;
381381

382382
JMXServerOptions jmxServerOptions = DatabaseDescriptor.getJmxServerOptions();
@@ -406,9 +406,9 @@ public String name()
406406
}
407407

408408
@Override
409-
public void execute(StartupChecksConfiguration options)
409+
public void execute(StartupChecksConfiguration configuration)
410410
{
411-
if (options.isDisabled(name()))
411+
if (configuration.isDisabled(name()))
412412
return;
413413
if (COM_SUN_MANAGEMENT_JMXREMOTE_PORT.isPresent())
414414
{
@@ -427,9 +427,9 @@ public String name()
427427
}
428428

429429
@Override
430-
public void execute(StartupChecksConfiguration options)
430+
public void execute(StartupChecksConfiguration configuration)
431431
{
432-
if (options.isDisabled(name()))
432+
if (configuration.isDisabled(name()))
433433
return;
434434
// log warnings for different kinds of sub-optimal JVMs. tldr use 64-bit Oracle >= 1.6u32
435435
if (!DatabaseDescriptor.hasLargeAddressSpace())
@@ -495,9 +495,9 @@ public String name()
495495
}
496496

497497
@Override
498-
public void execute(StartupChecksConfiguration options) throws StartupException
498+
public void execute(StartupChecksConfiguration configuration) throws StartupException
499499
{
500-
if (options.isDisabled(name()))
500+
if (configuration.isDisabled(name()))
501501
return;
502502
// Fail-fast if the native library could not be linked.
503503
if (!NativeLibrary.isAvailable())
@@ -514,7 +514,7 @@ public String name()
514514
}
515515

516516
@Override
517-
public void execute(StartupChecksConfiguration options)
517+
public void execute(StartupChecksConfiguration configuration)
518518
{
519519
Optional<String> degradations = FBUtilities.getSystemInfo().isDegraded();
520520

@@ -567,9 +567,9 @@ private Map<String, String> getBlockDevices(String[] dataDirectories) {
567567
}
568568

569569
@Override
570-
public void execute(StartupChecksConfiguration options)
570+
public void execute(StartupChecksConfiguration configuration)
571571
{
572-
if (options.isDisabled(name()) || !FBUtilities.isLinux)
572+
if (configuration.isDisabled(name()) || !FBUtilities.isLinux)
573573
return;
574574

575575
String[] dataDirectories = DatabaseDescriptor.getRawConfig().data_file_directories;
@@ -648,9 +648,9 @@ private long getMaxMapCount()
648648
}
649649

650650
@Override
651-
public void execute(StartupChecksConfiguration options)
651+
public void execute(StartupChecksConfiguration configuration)
652652
{
653-
if (options.isDisabled(name()) || !FBUtilities.isLinux)
653+
if (configuration.isDisabled(name()) || !FBUtilities.isLinux)
654654
return;
655655

656656
if (DatabaseDescriptor.getDiskAccessMode() == Config.DiskAccessMode.standard &&
@@ -674,9 +674,9 @@ public String name()
674674
}
675675

676676
@Override
677-
public void execute(StartupChecksConfiguration options) throws StartupException
677+
public void execute(StartupChecksConfiguration configuration) throws StartupException
678678
{
679-
if (options.isDisabled(name()))
679+
if (configuration.isDisabled(name()))
680680
return;
681681
// check all directories(data, commitlog, saved cache) for existence and permission
682682
Iterable<String> dirs = Iterables.concat(Arrays.asList(DatabaseDescriptor.getAllDataFileLocations()),
@@ -715,9 +715,9 @@ public String name()
715715
}
716716

717717
@Override
718-
public void execute(StartupChecksConfiguration options) throws StartupException
718+
public void execute(StartupChecksConfiguration configuration) throws StartupException
719719
{
720-
if (options.isDisabled(name()))
720+
if (configuration.isDisabled(name()))
721721
return;
722722
final Set<String> invalid = new HashSet<>();
723723
final Set<String> nonSSTablePaths = new HashSet<>();
@@ -836,9 +836,9 @@ public String name()
836836
}
837837

838838
@Override
839-
public void execute(StartupChecksConfiguration options) throws StartupException
839+
public void execute(StartupChecksConfiguration configuration) throws StartupException
840840
{
841-
if (options.isDisabled(name()))
841+
if (configuration.isDisabled(name()))
842842
return;
843843
// check the system keyspace to keep user from shooting self in foot by changing partitioner, cluster name, etc.
844844
// we do a one-off scrub of the system keyspace first; we can't load the list of the rest of the keyspaces,
@@ -873,9 +873,9 @@ public String name()
873873
}
874874

875875
@Override
876-
public void execute(StartupChecksConfiguration options) throws StartupException
876+
public void execute(StartupChecksConfiguration configuration) throws StartupException
877877
{
878-
if (options.isDisabled(name()))
878+
if (configuration.isDisabled(name()))
879879
return;
880880
Optional<String> errMsg = checkLegacyAuthTablesMessage();
881881
if (errMsg.isPresent())
@@ -956,9 +956,9 @@ else if (perfEventParanoid > 1 || kptrRestrict != 0)
956956
}
957957

958958
@Override
959-
public void execute(StartupChecksConfiguration startupChecksOptions)
959+
public void execute(StartupChecksConfiguration configuration)
960960
{
961-
execute(startupChecksOptions, false);
961+
execute(configuration, false);
962962
}
963963
}
964964

‎test/unit/org/apache/cassandra/config/DatabaseDescriptorRefTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -176,8 +176,7 @@ public class DatabaseDescriptorRefTest
176176
"org.apache.cassandra.config.RetrySpec",
177177
"org.apache.cassandra.config.RetrySpec$MaxAttempt",
178178
"org.apache.cassandra.config.RetrySpec$Type",
179-
"org.apache.cassandra.config.StartupChecksOptions",
180-
"org.apache.cassandra.config.StartupChecksOptions",
179+
"org.apache.cassandra.config.StartupChecksConfiguration",
181180
"org.apache.cassandra.config.StorageAttachedIndexOptions",
182181
"org.apache.cassandra.config.StringRetryStrategy",
183182
"org.apache.cassandra.config.SubnetGroups",
@@ -327,6 +326,7 @@ public class DatabaseDescriptorRefTest
327326
"org.apache.cassandra.service.RetryStrategy$WaitRandomizerFactory",
328327
"org.apache.cassandra.service.RetryStrategy$1",
329328
"org.apache.cassandra.service.RetryStrategy$WaitRandomizer",
329+
"org.apache.cassandra.service.StartupCheck",
330330
"org.apache.cassandra.service.TimeoutStrategy",
331331
"org.apache.cassandra.service.TimeoutStrategy$LatencyModifierFactory",
332332
"org.apache.cassandra.service.TimeoutStrategy$Wait",

‎test/unit/org/apache/cassandra/service/StartupChecksTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,7 @@ public String name()
276276
}
277277

278278
@Override
279-
public void execute(StartupChecksConfiguration startupChecksOptions)
279+
public void execute(StartupChecksConfiguration configuration)
280280
{
281281

282282
}
@@ -323,7 +323,7 @@ public String name()
323323
}
324324

325325
@Override
326-
public void execute(StartupChecksConfiguration startupChecksOptions)
326+
public void execute(StartupChecksConfiguration configuration)
327327
{
328328

329329
}

0 commit comments

Comments
 (0)