Skip to content

Commit 0e36849

Browse files
Address PR review comments
1 parent 4616736 commit 0e36849

4 files changed

Lines changed: 10 additions & 9 deletions

File tree

server/src/main/java/org/apache/cassandra/sidecar/job/OperationalJob.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -239,10 +239,11 @@ public String name()
239239
String simpleName = this.getClass().getSimpleName();
240240
return simpleName.isEmpty() ? this.getClass().getName() : simpleName;
241241
}
242-
243-
/**
244-
* @return the {@link OperationType} of this job
242+
243+
/**
244+
* {@inheritDoc}
245245
*/
246+
@Override
246247
public abstract OperationType operationType();
247248

248249
/**

server/src/main/java/org/apache/cassandra/sidecar/job/OperationalJobManager.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ public void trySubmitJob(OperationalJob job,
121121
OperationalJob tracked = jobTracker.computeIfAbsent(job.jobId(), jobId -> job);
122122
if (tracked == job)
123123
{
124-
checkCoordination(job);
124+
tryCoordination(job);
125125
internalExecutorPool.executeBlocking(job::execute);
126126
}
127127
}
@@ -158,7 +158,7 @@ private void checkConflict(OperationalJob job) throws OperationalJobConflictExce
158158
* @param job instance of the job to coordinate
159159
* @throws OperationalJobConflictException when the coordinator cannot activate the operation
160160
*/
161-
private void checkCoordination(OperationalJob job) throws OperationalJobConflictException
161+
private void tryCoordination(OperationalJob job) throws OperationalJobConflictException
162162
{
163163
if (job.requiresCoordination())
164164
{

server/src/main/java/org/apache/cassandra/sidecar/job/StorageOperationalJobCoordinator.java renamed to server/src/main/java/org/apache/cassandra/sidecar/job/StorageBackedOperationalJobCoordinator.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,12 @@
3333
* for coordination of active operations.
3434
*/
3535
@Singleton
36-
public class StorageOperationalJobCoordinator implements OperationalJobCoordinator
36+
public class StorageBackedOperationalJobCoordinator implements OperationalJobCoordinator
3737
{
3838
private final StorageProvider storageProvider;
3939

4040
@Inject
41-
public StorageOperationalJobCoordinator(StorageProvider storageProvider)
41+
public StorageBackedOperationalJobCoordinator(StorageProvider storageProvider)
4242
{
4343
this.storageProvider = storageProvider;
4444
}

server/src/main/java/org/apache/cassandra/sidecar/modules/CassandraOperationsModule.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
import org.apache.cassandra.sidecar.job.InMemoryOperationalJobTracker;
6565
import org.apache.cassandra.sidecar.job.OperationalJobCoordinator;
6666
import org.apache.cassandra.sidecar.job.OperationalJobTracker;
67-
import org.apache.cassandra.sidecar.job.StorageOperationalJobCoordinator;
67+
import org.apache.cassandra.sidecar.job.StorageBackedOperationalJobCoordinator;
6868
import org.apache.cassandra.sidecar.modules.multibindings.KeyClassMapKey;
6969
import org.apache.cassandra.sidecar.modules.multibindings.TableSchemaMapKeys;
7070
import org.apache.cassandra.sidecar.modules.multibindings.VertxRouteMapKeys;
@@ -85,7 +85,7 @@ public class CassandraOperationsModule extends AbstractModule
8585
protected void configure()
8686
{
8787
bind(OperationalJobTracker.class).to(InMemoryOperationalJobTracker.class);
88-
bind(OperationalJobCoordinator.class).to(StorageOperationalJobCoordinator.class);
88+
bind(OperationalJobCoordinator.class).to(StorageBackedOperationalJobCoordinator.class);
8989
}
9090

9191
@ProvidesIntoMap

0 commit comments

Comments
 (0)