mirror of
https://github.com/Graylog2/graylog2-server.git
synced 2026-03-13 09:32:21 +08:00
datanode distribution provider refactoring (#16867)
* datanode distribution provider refactoring * postpone opensearch distribution check till preflight checks * fixd OpensearchBinPreflightCheck
This commit is contained in:
@@ -30,6 +30,7 @@ import com.github.joschi.jadconfig.validators.URIAbsoluteValidator;
|
||||
import com.google.common.annotations.VisibleForTesting;
|
||||
import com.google.common.net.InetAddresses;
|
||||
import org.graylog.datanode.configuration.BaseConfiguration;
|
||||
import org.graylog.datanode.configuration.OpensearchDistributionProvider;
|
||||
import org.graylog2.plugin.Tools;
|
||||
import org.graylog2.shared.SuppressForbidden;
|
||||
import org.joda.time.DateTimeZone;
|
||||
@@ -274,16 +275,6 @@ public class Configuration extends BaseConfiguration {
|
||||
}
|
||||
}
|
||||
|
||||
@ValidatorMethod
|
||||
@SuppressWarnings("unused")
|
||||
public void validateOpenSearchDistribution() throws ValidationException {
|
||||
try {
|
||||
OpensearchDistribution.detectInDirectory(Path.of(getOpensearchDistributionRoot()));
|
||||
} catch (RuntimeException | IOException e) {
|
||||
throw new ValidationException("Could not detect OpenSearch in " + getOpensearchDistributionRoot() + ", please check your installation. Error was: " + e.getMessage());
|
||||
}
|
||||
}
|
||||
|
||||
public String getNodeIdFile() {
|
||||
return nodeIdFile;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user