diff options
Diffstat (limited to 'configserver')
2 files changed, 3 insertions, 20 deletions
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionRepository.java b/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionRepository.java index 9778b1fc1f2..95b29235e2f 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionRepository.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionRepository.java @@ -123,7 +123,6 @@ public class SessionRepository { private final Zone zone; private final ModelFactoryRegistry modelFactoryRegistry; private final ConfigDefinitionRepo configDefinitionRepo; - private final BooleanFlag rewriteSearchDefinitions; public SessionRepository(TenantName tenantName, TenantApplications applicationRepo, @@ -164,7 +163,6 @@ public class SessionRepository { this.zone = zone; this.modelFactoryRegistry = modelFactoryRegistry; this.configDefinitionRepo = configDefinitionRepo; - this.rewriteSearchDefinitions = Flags.MOVE_SEARCH_DEFINITIONS_TO_SCHEMAS_DIR.bindTo(flagSource); loadSessions(Flags.LOAD_LOCAL_SESSIONS_WHEN_BOOTSTRAPPING.bindTo(flagSource)); // Needs to be done before creating cache below this.directoryCache = curator.createDirectoryCache(sessionsPath.getAbsolute(), false, false, zkCacheExecutor); @@ -685,8 +683,7 @@ public class SessionRepository { tempDestinationDir = Files.createTempDirectory(destinationDir.getParentFile().toPath(), "app-package"); log.log(Level.FINE, "Copying dir " + sourceDir.getAbsolutePath() + " to " + tempDestinationDir.toFile().getAbsolutePath()); IOUtils.copyDirectory(sourceDir, tempDestinationDir.toFile()); - if (rewriteSearchDefinitions.value()) - moveSearchDefinitionsToSchemasDir(tempDestinationDir); + moveSearchDefinitionsToSchemasDir(tempDestinationDir); log.log(Level.FINE, "Moving " + tempDestinationDir + " to " + destinationDir.getAbsolutePath()); Files.move(tempDestinationDir, destinationDir.toPath(), StandardCopyOption.ATOMIC_MOVE); diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/session/SessionRepositoryTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/session/SessionRepositoryTest.java index 4790d8f4ae2..f0897411390 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/session/SessionRepositoryTest.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/session/SessionRepositoryTest.java @@ -269,29 +269,15 @@ public class SessionRepositoryTest { public void require_that_searchdefinitions_are_written_to_schemas_dir() throws Exception { setup(); - // App has schemas in searchdefinitions/, should NOT be moved to schemas/ on deploy - flagSource.withBooleanFlag(Flags.MOVE_SEARCH_DEFINITIONS_TO_SCHEMAS_DIR.id(), false); + flagSource.withBooleanFlag(Flags.MOVE_SEARCH_DEFINITIONS_TO_SCHEMAS_DIR.id(), true); long sessionId = deploy(applicationId, new File("src/test/apps/deprecated-features-app")); LocalSession session = sessionRepository.getLocalSession(sessionId); assertEquals(1, session.applicationPackage.get().getSchemas().size()); ApplicationFile schema = getSchema(session, "schemas"); - assertFalse(schema.exists()); - ApplicationFile sd = getSchema(session, "searchdefinitions"); - assertTrue(sd.exists()); - - - // App has schemas in searchdefinitions/, should be moved to schemas/ on deploy - flagSource.withBooleanFlag(Flags.MOVE_SEARCH_DEFINITIONS_TO_SCHEMAS_DIR.id(), true); - sessionId = deploy(applicationId, new File("src/test/apps/deprecated-features-app")); - session = sessionRepository.getLocalSession(sessionId); - - assertEquals(1, session.applicationPackage.get().getSchemas().size()); - - schema = getSchema(session, "schemas"); assertTrue(schema.exists()); - sd = getSchema(session, "searchdefinitions"); + ApplicationFile sd = getSchema(session, "searchdefinitions"); assertFalse(sd.exists()); } |