Merge pull request #27387 from mheon/remove_boltdb

Remove BoltDB state support

Author: openshift-merge-bot[bot]

.cirrus.yml

@@ -57,7 +57,6 @@ env:
     VM_IMAGE_NAME:           # One of the "Google-cloud VM Images" (above)
     CTR_FQIN:                # One of the "Container FQIN's" (above)
     CI_DESIRED_RUNTIME: crun    # As of 2024-05-28 there are no other supported runtimes
-    CI_DESIRED_DATABASE: sqlite # 'sqlite' or 'boltdb'
     CI_DESIRED_STORAGE: overlay # overlay, vfs, or composefs (which is actually overlay)
 
     # Curl-command prefix for downloading task artifacts, simply add the
@@ -161,7 +160,6 @@ build_task:
               TEST_BUILD_TAGS: ""
               VM_IMAGE_NAME: ${PRIOR_FEDORA_CACHE_IMAGE_NAME}
               CTR_FQIN: ${PRIOR_FEDORA_CONTAINER_FQIN}
-              CI_DESIRED_DATABASE: boltdb
               CI_DESIRED_STORAGE: vfs
         - env:
               <<: *stdenvars
@@ -684,7 +682,7 @@ compose_test_task:
 local_integration_test_task: &local_integration_test_task
     # Integration-test task name convention:
     # <int.|sys.> <podman|remote> <Distro NV> <root|rootless>
-    name: &std_name_fmt "$TEST_FLAVOR $PODBIN_NAME $DISTRO_NV $PRIV_NAME $TEST_ENVIRON ${CI_DESIRED_DATABASE}"
+    name: &std_name_fmt "$TEST_FLAVOR $PODBIN_NAME $DISTRO_NV $PRIV_NAME $TEST_ENVIRON"
     alias: local_integration_test
     # Docs: ./contrib/cirrus/CIModes.md (Cirrus Task contexts and runtime modes)
     # only when: - main rules (see doc above); or
@@ -737,11 +735,6 @@ container_integration_test_task:
               DISTRO_NV: ${FEDORA_NAME}
               VM_IMAGE_NAME: ${FEDORA_CACHE_IMAGE_NAME}
               CTR_FQIN: ${FEDORA_CONTAINER_FQIN}
-        - env:
-              DISTRO_NV: ${PRIOR_FEDORA_NAME}
-              VM_IMAGE_NAME: ${PRIOR_FEDORA_CACHE_IMAGE_NAME}
-              CTR_FQIN: ${PRIOR_FEDORA_CONTAINER_FQIN}
-              CI_DESIRED_DATABASE: boltdb
     gce_instance: *fastvm
     env:
         TEST_FLAVOR: int
@@ -1095,12 +1088,6 @@ upgrade_test_task:
         (changesInclude('**/*.go', '**/*.c', '**/*.h') && !changesIncludeOnly('test/**', 'pkg/machine/e2e/**'))
     depends_on: *build
     matrix:
-        - env:
-              # 2024-02: as long as possible/reasonable, try to keep
-              #   one version < 4.8 so we can test boltdb. v4.3.1 is
-              #   the lowest we can go right now, builds before that
-              #   have netavark <1.4 which hangs on f39 kernel (#21863).
-              PODMAN_UPGRADE_FROM: v4.3.1
         - env:
               PODMAN_UPGRADE_FROM: v4.8.0
     gce_instance: *standardvm
@@ -1109,8 +1096,6 @@ upgrade_test_task:
         TEST_BUILD_TAGS: ""
         DISTRO_NV: ${FEDORA_NAME}
         VM_IMAGE_NAME: ${FEDORA_CACHE_IMAGE_NAME}
-        # Never force a DB, let the old version decide its default
-        CI_DESIRED_DATABASE:
     clone_script: *get_gosrc
     setup_script: *setup
     main_script: *main

cmd/podman/root.go

@@ -569,9 +569,6 @@ func rootFlags(cmd *cobra.Command, podmanConfig *entities.PodmanConfig) {
 		lFlags.StringArray(moduleFlagName, nil, "Load the containers.conf(5) module")
 		_ = cmd.RegisterFlagCompletionFunc(moduleFlagName, common.AutocompleteContainersConfModules)
 
-		// A *hidden* flag to change the database backend.
-		pFlags.StringVar(&podmanConfig.ContainersConf.Engine.DBBackend, "db-backend", podmanConfig.ContainersConfDefaultsRO.Engine.DBBackend, "Database backend to use")
-
 		cgroupManagerFlagName := "cgroup-manager"
 		pFlags.StringVar(&podmanConfig.ContainersConf.Engine.CgroupManager, cgroupManagerFlagName, podmanConfig.ContainersConfDefaultsRO.Engine.CgroupManager, "Cgroup manager to use (\"cgroupfs\"|\"systemd\")")
 		_ = cmd.RegisterFlagCompletionFunc(cgroupManagerFlagName, common.AutocompleteCgroupManager)
@@ -659,7 +656,6 @@ func rootFlags(cmd *cobra.Command, podmanConfig *entities.PodmanConfig) {
 		// Hide these flags for both ABI and Tunneling
 		for _, f := range []string{
 			"cpu-profile",
-			"db-backend",
 			"default-mounts-file",
 			"max-workers",
 			"memory-profile",

contrib/cirrus/setup_environment.sh

@@ -99,14 +99,6 @@ mkdir -p /etc/containers/containers.conf.d
 [[ "$CG_FS_TYPE" == "cgroup2fs" ]] || \
     die "Only cgroups v2 CI VMs are supported, not: '$CG_FS_TYPE'"
 
-# For testing boltdb without having to use --db-backend.
-# As of #20318 (2023-10-10) sqlite is the default, so do not create
-# a containers.conf file in that condition.
-# shellcheck disable=SC2154
-if [[ "${CI_DESIRED_DATABASE:-sqlite}" != "sqlite" ]]; then
-    printf "[engine]\ndatabase_backend=\"$CI_DESIRED_DATABASE\"\n" > /etc/containers/containers.conf.d/92-db.conf
-fi
-
 if ((CONTAINER==0)); then  # Not yet running inside a container
     showrun echo "conditional setup for CONTAINER == 0"
     # Discovered reemergence of BFQ scheduler bug in kernel 5.8.12-200
@@ -151,27 +143,6 @@ case "$OS_RELEASE_ID" in
     *) die_unknown OS_RELEASE_ID
 esac
 
-# Database: force SQLite or BoltDB as requested in .cirrus.yml.
-# If unset, will default to SQLite.
-# shellcheck disable=SC2154
-showrun echo "about to set up for CI_DESIRED_DATABASE [=$CI_DESIRED_DATABASE]"
-case "$CI_DESIRED_DATABASE" in
-    sqlite)
-        warn "Forcing PODMAN_DB=sqlite"
-        echo "PODMAN_DB=sqlite" >> /etc/ci_environment
-	;;
-    boltdb)
-        warn "Forcing PODMAN_DB=boltdb"
-        echo "PODMAN_DB=boltdb" >> /etc/ci_environment
-	;;
-    "")
-        warn "Using default Podman database"
-        ;;
-    *)
-        die_unknown CI_DESIRED_DATABASE
-        ;;
-esac
-
 # Force the requested storage driver for both system and e2e tests.
 # This is (sigh) different because e2e tests have their own special way
 # of ignoring system defaults.

go.mod

@@ -64,7 +64,6 @@ require (
 	github.com/stretchr/testify v1.11.1
 	github.com/vbauerster/mpb/v8 v8.10.2
 	github.com/vishvananda/netlink v1.3.1
-	go.etcd.io/bbolt v1.4.3
 	go.podman.io/common v0.66.0
 	go.podman.io/image/v5 v5.38.0
 	go.podman.io/storage v1.61.0
@@ -173,6 +172,7 @@ require (
 	github.com/vbatts/tar-split v0.12.1 // indirect
 	github.com/vishvananda/netns v0.0.5 // indirect
 	github.com/yusufpapurcu/wmi v1.2.4 // indirect
+	go.etcd.io/bbolt v1.4.3 // indirect
 	go.opentelemetry.io/auto/sdk v1.1.0 // indirect
 	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.61.0 // indirect
 	go.opentelemetry.io/otel v1.36.0 // indirect