Merge pull request #760 from bottlerocket-os/no-data-store-ver

Remove data store version
bottlerocket-os · Feb 21, 2020 · 41ab462 · 41ab462
2 parents c624170 + f8a95cf
commit 41ab462
Show file tree

Hide file tree

Showing 45 changed files with 515 additions and 1,037 deletions.
diff --git a/Release.toml b/Release.toml
@@ -1,5 +1,4 @@
 version = "0.2.2"
-datastore_version = "0.3"
 
 [migrations]
 # Happy path - skip over 0.1, which had an issue with compressed migrations.  Normal new migrations go here.

diff --git a/packages/workspaces/data-store-version b/packages/workspaces/data-store-version
diff --git a/packages/workspaces/migrator.service b/packages/workspaces/migrator.service
@@ -3,7 +3,7 @@ Description=Bottlerocket data store migrator
 
 [Service]
 Type=oneshot
-ExecStart=/usr/bin/migrator --datastore-path /var/lib/bottlerocket/datastore/current --migration-directories /var/lib/bottlerocket/datastore/migrations --migrate-to-version-from-file /usr/share/bottlerocket/data-store-version
+ExecStart=/usr/bin/migrator --datastore-path /var/lib/bottlerocket/datastore/current --migration-directories /var/lib/bottlerocket/datastore/migrations --migrate-to-version-from-os-release
 RemainAfterExit=true
 StandardError=journal+console
 

diff --git a/packages/workspaces/workspaces.spec b/packages/workspaces/workspaces.spec
@@ -9,7 +9,6 @@ Summary: Bottlerocket's first-party code
 License: Apache-2.0 OR MIT
 
 # sources < 100: misc
-Source1: data-store-version
 Source2: api-sysusers.conf
 # Taken from https://github.com/awslabs/amazon-eks-ami/blob/master/files/eni-max-pods.txt
 Source3: eni-max-pods
@@ -217,7 +216,6 @@ done
 install -d %{buildroot}%{migration_dir}
 
 install -d %{buildroot}%{_cross_datadir}/bottlerocket
-install -p -m 0644 %{S:1} %{buildroot}%{_cross_datadir}/bottlerocket
 
 install -d %{buildroot}%{_cross_sysusersdir}
 install -p -m 0644 %{S:2} %{buildroot}%{_cross_sysusersdir}/api.conf
@@ -251,7 +249,6 @@ install -p -m 0644 %{S:201} %{buildroot}%{_cross_tmpfilesdir}/host-containers.co
 %{_cross_bindir}/apiserver
 %{_cross_unitdir}/apiserver.service
 %{_cross_unitdir}/migrator.service
-%{_cross_datadir}/bottlerocket/data-store-version
 %{_cross_sysusersdir}/api.conf
 
 %files -n %{_cross_os}apiclient

diff --git a/workspaces/Cargo.lock b/workspaces/Cargo.lock
diff --git a/workspaces/Cargo.toml b/workspaces/Cargo.toml
@@ -3,7 +3,6 @@ members = [
     "api/apiserver",
     "api/apiclient",
     "api/bork",
-    "api/data_store_version",
     "api/moondog",
     "api/netdog",
     "api/sundog",

diff --git a/workspaces/api/README.md b/workspaces/api/README.md
@@ -39,7 +39,7 @@ Further docs:
 * [Migration system](migration/)
 
 The migrator ensures the data store is up to date by running any applicable data store migrations.
-The existing data store format version is found by looking at the symlink naming in `/var/lib/bottlerocket/datastore`, and the incoming data store format version is found by looking at `/usr/share/bottlerocket/data-store-version` in the booting image.
+The existing data store format version is found by looking at the symlink naming in `/var/lib/bottlerocket/datastore`, and the incoming data store format version is found by looking at `/etc/os-release` in the booting image.
 
 On first boot, [storewolf](#storewolf) hasn’t run yet, so there’s no data store, so the migrator has nothing to do.
 

diff --git a/workspaces/api/apiserver/README.md b/workspaces/api/apiserver/README.md
@@ -79,4 +79,4 @@ See `../../apiclient/README.md` for client examples.
 
 ## Colophon
 
-This text was generated using [cargo-readme](https://crates.io/crates/cargo-readme), and includes the rustdoc from `src/lib.rs`.
+This text was generated using [cargo-readme](https://crates.io/crates/cargo-readme), and includes the rustdoc from `src/lib.rs`.
diff --git a/workspaces/api/apiserver/src/datastore/filesystem.rs b/workspaces/api/apiserver/src/datastore/filesystem.rs
@@ -550,7 +550,19 @@ impl DataStore for FilesystemDataStore {
         );
 
         for entry in walker {
-            let entry = entry.context(error::ListKeys)?;
+            let entry = match entry {
+                Ok(entry) => entry,
+                Err(e) => {
+                    if let Some(io_error) = e.io_error() {
+                        // If there's no pending directory, that's OK, just return empty set.
+                        if io_error.kind() == io::ErrorKind::NotFound {
+                            break;
+                        }
+                    }
+                    return Err(e).context(error::ListKeys);
+                }
+            };
+
             if entry.file_type().is_dir() {
                 // The directory name should be valid UTF-8, encoded by encode_path_component,
                 // or the data store has been corrupted.

diff --git a/workspaces/api/data_store_version/Cargo.toml b/workspaces/api/data_store_version/Cargo.toml
diff --git a/workspaces/api/data_store_version/README.md b/workspaces/api/data_store_version/README.md
diff --git a/workspaces/api/data_store_version/README.tpl b/workspaces/api/data_store_version/README.tpl
diff --git a/workspaces/api/data_store_version/build.rs b/workspaces/api/data_store_version/build.rs