Skip to content

Commit fcd5afa

Browse files
authored
Mark custom GeoIP database NotMultiProjectCapable (#130064)
1 parent 366bc00 commit fcd5afa

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

modules/ingest-geoip/src/main/java/org/elasticsearch/ingest/geoip/ConfigDatabases.java

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
import org.apache.logging.log4j.LogManager;
1212
import org.apache.logging.log4j.Logger;
1313
import org.elasticsearch.cluster.metadata.ProjectId;
14-
import org.elasticsearch.core.FixForMultiProject;
14+
import org.elasticsearch.core.NotMultiProjectCapable;
1515
import org.elasticsearch.env.Environment;
1616
import org.elasticsearch.watcher.FileChangesListener;
1717
import org.elasticsearch.watcher.FileWatcher;
@@ -34,6 +34,9 @@
3434
* Keeps track of user provided databases in the ES_HOME/config/ingest-geoip directory.
3535
* This directory is monitored and files updates are picked up and may cause databases being loaded or removed at runtime.
3636
*/
37+
@NotMultiProjectCapable(
38+
description = "Custom databases not available in serverless, we should review this class for MP again after serverless is enabled"
39+
)
3740
final class ConfigDatabases implements Closeable {
3841

3942
private static final Logger logger = LogManager.getLogger(ConfigDatabases.class);
@@ -71,7 +74,7 @@ Map<String, DatabaseReaderLazyLoader> getConfigDatabases() {
7174
return configDatabases;
7275
}
7376

74-
@FixForMultiProject(description = "Replace DEFAULT project")
77+
@NotMultiProjectCapable(description = "Replace DEFAULT project after serverless is enabled")
7578
void updateDatabase(Path file, boolean update) {
7679
String databaseFileName = file.getFileName().toString();
7780
try {
@@ -93,7 +96,7 @@ void updateDatabase(Path file, boolean update) {
9396
}
9497
}
9598

96-
@FixForMultiProject(description = "Replace DEFAULT project")
99+
@NotMultiProjectCapable(description = "Replace DEFAULT project after serverless is enabled")
97100
Map<String, DatabaseReaderLazyLoader> initConfigDatabases() throws IOException {
98101
Map<String, DatabaseReaderLazyLoader> databases = new HashMap<>();
99102

0 commit comments

Comments
 (0)