aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2021-01-23 21:04:33 +0000
committerHenning Baldersheim <balder@yahoo-inc.com>2021-01-23 21:04:33 +0000
commit1c04490eab735966b2581ef526177917613f9643 (patch)
treeb4990e905607d28e4a0b73e06bc4bb05a5265943
parentfa4ba96f1ebb4d2e544ff0a8e5d9cc6c3a693f78 (diff)
Reverse the logic so it is correct.
-rw-r--r--searchcore/src/vespa/searchcore/proton/server/maintenance_jobs_injector.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/searchcore/src/vespa/searchcore/proton/server/maintenance_jobs_injector.cpp b/searchcore/src/vespa/searchcore/proton/server/maintenance_jobs_injector.cpp
index 2f45b530092..aa04cc89f52 100644
--- a/searchcore/src/vespa/searchcore/proton/server/maintenance_jobs_injector.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/maintenance_jobs_injector.cpp
@@ -40,22 +40,22 @@ injectLidSpaceCompactionJobs(MaintenanceController &controller,
IMaintenanceJob::UP job;
if (config.getLidSpaceCompactionConfig().useBucketExecutor()) {
- job = std::make_unique<LidSpaceCompactionJob>(
+ job = std::make_unique<lidspace::CompactionJob>(
config.getLidSpaceCompactionConfig(),
- *lidHandler, opStorer, fbHandler,
+ *lidHandler, opStorer, controller.masterThread(), bucketExecutor,
diskMemUsageNotifier,
config.getBlockableJobConfig(),
clusterStateChangedNotifier,
- (calc ? calc->nodeRetired() : false));
+ (calc ? calc->nodeRetired() : false),
+ bucketSpace);
} else {
- job = std::make_unique<lidspace::CompactionJob>(
+ job = std::make_unique<LidSpaceCompactionJob>(
config.getLidSpaceCompactionConfig(),
- *lidHandler, opStorer, controller.masterThread(), bucketExecutor,
+ *lidHandler, opStorer, fbHandler,
diskMemUsageNotifier,
config.getBlockableJobConfig(),
clusterStateChangedNotifier,
- (calc ? calc->nodeRetired() : false),
- bucketSpace);
+ (calc ? calc->nodeRetired() : false));
}
controller.registerJobInMasterThread(trackJob(tracker, std::move(job)));
}