Skip to content

Commit 5ab154f

Browse files
committed
In SQLite state, use defaults for empty-string checks
As part of our database init, we perform a check of the current values for a few fields (graph driver, graph root, static dir, and a few more) to validate that Libpod is being started with a sane & sensible config, and the user's containers can actually be expected to work. Basically, we take the current runtime config and compare against values cached in the database from the first time Podman was run. We've had some issues with this logic before this year around symlink resolution, but this is a new edge case. Somehow, the database is being loaded with the empty string for some fields (at least graph driver) which is causing comparisons to fail because we will never compare against "" for those fields - we insert the default value instead, assuming we have one. Having a value of "" in the database largely invalidates the check so arguably we could just drop it, but what BoltDB did - and what SQLite does after this patch - is to use the default value for comparison instead of "". This should still catch some edge cases, and shouldn't be too harmful. What this does not do is identify or solve the reason that we are seeing the empty string in the database at all. From my read on the logic, it must mean that the graph driver is explicitly set to "" in the c/storage config at the time Podman is first run and I'm not precisely sure how that happens. Fixes containers#24738 Signed-off-by: Matt Heon <[email protected]>
1 parent 8ff491b commit 5ab154f

File tree

1 file changed

+24
-0
lines changed

1 file changed

+24
-0
lines changed

libpod/sqlite_state.go

+24
Original file line numberDiff line numberDiff line change
@@ -383,6 +383,30 @@ func (s *SQLiteState) ValidateDBConfig(runtime *Runtime) (defErr error) {
383383
return fmt.Errorf("retrieving DB config: %w", err)
384384
}
385385

386+
// Sometimes, for as-yet unclear reasons, the database value ends up set
387+
// to the empty string. If it does, this evaluation is always going to
388+
// fail, and libpod will be unusable.
389+
// At this point, the check is effectively meaningless - we don't
390+
// actually know the settings we should be checking against. The best
391+
// thing we can do (and what BoltDB did in this case) is to compare
392+
// against the default, on the assumption that is what was in use.
393+
// TODO: We can't remove this code without breaking existing SQLite DBs
394+
// that already have incorrect values in the database, but we should
395+
// investigate why this is happening and try and prevent the creation of
396+
// new databases with these garbage checks.
397+
if graphRoot == "" {
398+
logrus.Debugf("Database uses empty-string graph root, substituting default %q", storeOpts.GraphRoot)
399+
graphRoot = storeOpts.GraphRoot
400+
}
401+
if runRoot == "" {
402+
logrus.Debugf("Database uses empty-string run root, substituting default %q", storeOpts.RunRoot)
403+
runRoot = storeOpts.RunRoot
404+
}
405+
if graphDriver == "" {
406+
logrus.Debugf("Database uses empty-string graph driver, substituting default %q", storeOpts.GraphDriverName)
407+
graphDriver = storeOpts.GraphDriverName
408+
}
409+
386410
checkField := func(fieldName, dbVal, ourVal string, isPath bool) error {
387411
if isPath {
388412
// Tolerate symlinks when possible - most relevant for OStree systems

0 commit comments

Comments
 (0)