Skip to content

Commit 9a0e0ec

Browse files
nicktindallnicktindall
committed
Tidy
1 parent 23e5ca8 commit 9a0e0ec

File tree

8 files changed

+26
-46
lines changed

8 files changed

+26
-46
lines changed

‎server/src/internalClusterTest/java/org/elasticsearch/repositories/InvalidRepositoryIT.java‎

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -57,18 +57,10 @@ public UnstableRepository(
5757
NamedXContentRegistry namedXContentRegistry,
5858
ClusterService clusterService,
5959
BigArrays bigArrays,
60-
RecoverySettings recoverySettings
60+
RecoverySettings recoverySettings,
61+
SnapshotMetrics snapshotMetrics
6162
) {
62-
super(
63-
projectId,
64-
metadata,
65-
environment,
66-
namedXContentRegistry,
67-
clusterService,
68-
bigArrays,
69-
recoverySettings,
70-
SnapshotMetrics.NOOP
71-
);
63+
super(projectId, metadata, environment, namedXContentRegistry, clusterService, bigArrays, recoverySettings, snapshotMetrics);
7264
List<String> unstableNodes = UNSTABLE_NODES.get(metadata.settings());
7365
if (unstableNodes.contains(clusterService.getNodeName())) {
7466
throw new RepositoryException(metadata.name(), "Failed to create repository: current node is not stable");
@@ -95,7 +87,8 @@ public Map<String, Factory> getRepositories(
9587
namedXContentRegistry,
9688
clusterService,
9789
bigArrays,
98-
recoverySettings
90+
recoverySettings,
91+
snapshotMetrics
9992
)
10093
);
10194
}

‎server/src/internalClusterTest/java/org/elasticsearch/snapshots/MetadataLoadingDuringSnapshotRestoreIT.java‎

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -184,18 +184,10 @@ public CountingMockRepository(
184184
final NamedXContentRegistry namedXContentRegistry,
185185
ClusterService clusterService,
186186
BigArrays bigArrays,
187-
RecoverySettings recoverySettings
187+
RecoverySettings recoverySettings,
188+
SnapshotMetrics snapshotMetrics
188189
) {
189-
super(
190-
projectId,
191-
metadata,
192-
environment,
193-
namedXContentRegistry,
194-
clusterService,
195-
bigArrays,
196-
recoverySettings,
197-
SnapshotMetrics.NOOP
198-
);
190+
super(projectId, metadata, environment, namedXContentRegistry, clusterService, bigArrays, recoverySettings, snapshotMetrics);
199191
}
200192

201193
@Override
@@ -236,7 +228,8 @@ public Map<String, Repository.Factory> getRepositories(
236228
namedXContentRegistry,
237229
clusterService,
238230
bigArrays,
239-
recoverySettings
231+
recoverySettings,
232+
snapshotMetrics
240233
)
241234
);
242235
}

‎server/src/main/java/org/elasticsearch/node/NodeConstruction.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -729,7 +729,7 @@ private void construct(
729729
BigArrays bigArrays = serviceProvider.newBigArrays(pluginsService, pageCacheRecycler, circuitBreakerService);
730730

731731
final RecoverySettings recoverySettings = new RecoverySettings(settings, settingsModule.getClusterSettings());
732-
SnapshotMetrics snapshotMetrics = new SnapshotMetrics(telemetryProvider.getMeterRegistry());
732+
final SnapshotMetrics snapshotMetrics = new SnapshotMetrics(telemetryProvider.getMeterRegistry());
733733
RepositoriesModule repositoriesModule = new RepositoriesModule(
734734
environment,
735735
pluginsService.filterPlugins(RepositoryPlugin.class).toList(),

‎server/src/main/java/org/elasticsearch/repositories/RepositoriesService.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,6 @@ public class RepositoriesService extends AbstractLifecycleComponent implements C
124124
private final RepositoriesStatsArchive repositoriesStatsArchive;
125125

126126
private final List<BiConsumer<Snapshot, IndexVersion>> preRestoreChecks;
127-
private final SnapshotMetrics snapshotMetrics;
128127

129128
@SuppressWarnings("this-escape")
130129
public RepositoriesService(
@@ -155,7 +154,6 @@ public RepositoriesService(
155154
threadPool.relativeTimeInMillisSupplier()
156155
);
157156
this.preRestoreChecks = preRestoreChecks;
158-
this.snapshotMetrics = snapshotMetrics;
159157
snapshotMetrics.createSnapshotShardsInProgressMetric(this::getShardSnapshotsInProgress);
160158
}
161159

‎server/src/main/java/org/elasticsearch/snapshots/SnapshotsService.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4359,7 +4359,6 @@ private Collection<LongWithAttributes> getSnapshotsInProgress() {
43594359
if (repositoriesMetadata != null) {
43604360
repositoriesMetadata.repositories().forEach(repository -> {
43614361
int snapshotCount = snapshotsInProgress.forRepo(projectId, repository.name()).size();
4362-
logger.info("Returning snapshot count of {}", snapshotCount);
43634362
snapshotsInProgressMetrics.add(
43644363
new LongWithAttributes(snapshotCount, SnapshotMetrics.createAttributesMap(projectId, repository))
43654364
);

‎x-pack/plugin/searchable-snapshots/src/internalClusterTest/java/org/elasticsearch/xpack/searchablesnapshots/allocation/SearchableSnapshotDiskThresholdIntegTests.java‎

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -390,7 +390,8 @@ public Map<String, Repository.Factory> getRepositories(
390390
namedXContentRegistry,
391391
clusterService,
392392
bigArrays,
393-
recoverySettings
393+
recoverySettings,
394+
snapshotMetrics
394395
)
395396
);
396397
}
@@ -407,18 +408,10 @@ public CustomMockRepository(
407408
NamedXContentRegistry namedXContentRegistry,
408409
ClusterService clusterService,
409410
BigArrays bigArrays,
410-
RecoverySettings recoverySettings
411+
RecoverySettings recoverySettings,
412+
SnapshotMetrics snapshotMetrics
411413
) {
412-
super(
413-
projectId,
414-
metadata,
415-
environment,
416-
namedXContentRegistry,
417-
clusterService,
418-
bigArrays,
419-
recoverySettings,
420-
SnapshotMetrics.NOOP
421-
);
414+
super(projectId, metadata, environment, namedXContentRegistry, clusterService, bigArrays, recoverySettings, snapshotMetrics);
422415
}
423416

424417
private void unlockRestore() {

‎x-pack/plugin/snapshot-repo-test-kit/src/internalClusterTest/java/org/elasticsearch/repositories/blobstore/testkit/analyze/RepositoryAnalysisFailureIT.java‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -555,7 +555,8 @@ public Map<String, Repository.Factory> getRepositories(
555555
clusterService,
556556
bigArrays,
557557
recoverySettings,
558-
BlobPath.EMPTY
558+
BlobPath.EMPTY,
559+
snapshotMetrics
559560
)
560561
);
561562
}
@@ -572,9 +573,10 @@ static class DisruptableRepository extends BlobStoreRepository {
572573
ClusterService clusterService,
573574
BigArrays bigArrays,
574575
RecoverySettings recoverySettings,
575-
BlobPath basePath
576+
BlobPath basePath,
577+
SnapshotMetrics snapshotMetrics
576578
) {
577-
super(projectId, metadata, namedXContentRegistry, clusterService, bigArrays, recoverySettings, basePath, SnapshotMetrics.NOOP);
579+
super(projectId, metadata, namedXContentRegistry, clusterService, bigArrays, recoverySettings, basePath, snapshotMetrics);
578580
}
579581

580582
void setBlobStore(BlobStore blobStore) {

‎x-pack/plugin/snapshot-repo-test-kit/src/internalClusterTest/java/org/elasticsearch/repositories/blobstore/testkit/analyze/RepositoryAnalysisSuccessIT.java‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,8 @@ public Map<String, Repository.Factory> getRepositories(
197197
clusterService,
198198
bigArrays,
199199
recoverySettings,
200-
buildBlobPath(metadata.settings())
200+
buildBlobPath(metadata.settings()),
201+
snapshotMetrics
201202
)
202203
);
203204
}
@@ -227,9 +228,10 @@ static class AssertingRepository extends BlobStoreRepository {
227228
ClusterService clusterService,
228229
BigArrays bigArrays,
229230
RecoverySettings recoverySettings,
230-
BlobPath basePath
231+
BlobPath basePath,
232+
SnapshotMetrics snapshotMetrics
231233
) {
232-
super(projectId, metadata, namedXContentRegistry, clusterService, bigArrays, recoverySettings, basePath, SnapshotMetrics.NOOP);
234+
super(projectId, metadata, namedXContentRegistry, clusterService, bigArrays, recoverySettings, basePath, snapshotMetrics);
233235
}
234236

235237
void setBlobStore(BlobStore blobStore) {

0 commit comments

Comments
 (0)