diff options
author | Arne Juul <arnej@yahooinc.com> | 2023-01-24 13:56:04 +0000 |
---|---|---|
committer | Arne Juul <arnej@yahooinc.com> | 2023-01-24 14:00:10 +0000 |
commit | 091e1b11ecfeb09025cea8316c681e1e8da8c6ea (patch) | |
tree | e0d240e63c3b1f01021b51aeeab6cedc4553154b /configserver | |
parent | 16b5b25f8c7512c122bb3e7c1cd5c412f8506c48 (diff) |
ignore ._foo.sd and other "resource fork" like names
Diffstat (limited to 'configserver')
-rw-r--r-- | configserver/src/main/java/com/yahoo/vespa/config/server/zookeeper/ZKApplicationPackage.java | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/zookeeper/ZKApplicationPackage.java b/configserver/src/main/java/com/yahoo/vespa/config/server/zookeeper/ZKApplicationPackage.java index 9b23037ed19..fbf14fbdb8c 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/zookeeper/ZKApplicationPackage.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/zookeeper/ZKApplicationPackage.java @@ -138,9 +138,11 @@ public class ZKApplicationPackage extends AbstractApplicationPackage { @Override public List<NamedReader> getSchemas() { List<NamedReader> schemas = new ArrayList<>(); - for (String sd : zkApplication.getChildren(Path.fromString(USERAPP_ZK_SUBPATH).append(SCHEMAS_DIR))) { - if (sd.endsWith(SD_NAME_SUFFIX)) - schemas.add(zkApplication.getNamedReader(sd, Path.fromString(USERAPP_ZK_SUBPATH).append(SCHEMAS_DIR).append(sd))); + var sdDir = Path.fromString(USERAPP_ZK_SUBPATH).append(SCHEMAS_DIR); + for (String sdName : zkApplication.getChildren(sdDir)) { + if (validSchemaFilename(sdName)) { + schemas.add(zkApplication.getNamedReader(sdName, sdDir.append(sdName))); + } } return schemas; } |