Skip to content

Persistence upgrader: Fix unmanaged config not respected #5213

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kaikreuzer merged 2 commits into from
Dec 20, 2025
Merged

Persistence upgrader: Fix unmanaged config not respected #5213

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
29ad1cf
Persistence upgrader: Fix unmanaged config not respected
florian-h05 Dec 20, 2025
8ebc5cf
Address review
florian-h05 Dec 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions tools/upgradetool/src/main/java/org/openhab/core/tools/internal/PersistenceUpgrader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,10 +65,11 @@ public boolean execute(@Nullable Path userdataPath, @Nullable Path confPath) {
return false;
}

List<String> unmanagedConfigs;
List<String> managedConfigs;
try {
managedConfigs = managedPersistenceConfigs(installedPersistenceAddons(userdataPath),
unmanagedPersistenceConfigs(confPath));
unmanagedConfigs = unmanagedPersistenceConfigs(confPath);
managedConfigs = managedPersistenceConfigs(installedPersistenceAddons(userdataPath), unmanagedConfigs);
} catch (IOException e) {
logger.error("{} skipped: failed to read config: {}", getName(), e.getMessage());
return false;
Expand All @@ -77,6 +78,10 @@ public boolean execute(@Nullable Path userdataPath, @Nullable Path confPath) {
// No managed persistence configurations, so no need to upgrade
return true;
}
logger.debug("found {} (missing) managed persistence configurations: {}", managedConfigs.size(),
String.join(",", managedConfigs));
logger.debug("found {} unmanaged persistence configurations: {}", unmanagedConfigs.size(),
String.join(",", unmanagedConfigs));

Path persistenceJsonDatabasePath = userdataPath
.resolve(Path.of("jsondb", "org.openhab.core.persistence.PersistenceServiceConfiguration.json"));
Expand Down Expand Up @@ -165,8 +170,8 @@ private List<String> installedPersistenceAddons(Path userdataPath) throws IOExce
private List<String> unmanagedPersistenceConfigs(Path configPath) throws IOException {
Path persistenceConfigPath = configPath.resolve("persistence");
try (Stream<Path> files = Files.list(persistenceConfigPath)) {
return files.filter(configFile -> configFile.endsWith(".persist"))
.map(configFile -> configFile.getFileName().toString().replace(".persist", "")).toList();
return files.map(f -> f.getFileName().toString()).filter(f -> f.endsWith(".persist"))
.map(f -> f.replace(".persist", "")).toList();
}
}

Expand Down