many: remove robust-mount-namespace-updates experimental feature (#14117

) robust-mount-namespace-updates was not used anymore in any code path. Signed-off-by: Zeyad Gouda <[email protected]>
canonical · Jan 30, 2025 · 31518b0 · 31518b0
1 parent 3e93828
commit 31518b0
Show file tree

Hide file tree

Showing 7 changed files with 0 additions and 25 deletions.
diff --git a/cmd/snap-update-ns/main_test.go b/cmd/snap-update-ns/main_test.go
@@ -30,7 +30,6 @@ import (
 
 	update "github.com/snapcore/snapd/cmd/snap-update-ns"
 	"github.com/snapcore/snapd/dirs"
-	"github.com/snapcore/snapd/features"
 	"github.com/snapcore/snapd/logger"
 	"github.com/snapcore/snapd/osutil"
 	"github.com/snapcore/snapd/sandbox/cgroup"
@@ -169,9 +168,6 @@ func (s *mainSuite) TestRemovingSyntheticChanges(c *C) {
 	dirs.SetRootDir(c.MkDir())
 	defer dirs.SetRootDir("/")
 
-	c.Assert(os.MkdirAll(dirs.FeaturesDir, 0755), IsNil)
-	c.Assert(os.WriteFile(features.RobustMountNamespaceUpdates.ControlFile(), []byte(nil), 0644), IsNil)
-
 	// The snap `mysnap` no longer wishes to export it's usr/share/mysnap
 	// directory. All the synthetic changes that were associated with that mount
 	// entry can be discarded.

diff --git a/features/features.go b/features/features.go
@@ -46,8 +46,6 @@ const (
 	RefreshAppAwareness
 	// ClassicPreservesXdgRuntimeDir controls $XDG_RUNTIME_DIR in snaps with classic confinement.
 	ClassicPreservesXdgRuntimeDir
-	// RobustMountNamespaceUpdates controls how snap-update-ns updates existing mount namespaces.
-	RobustMountNamespaceUpdates
 	// UserDaemons controls availability of user mode service support.
 	UserDaemons
 	// DbusActivation controls whether snaps daemons can be activated via D-Bus
@@ -105,7 +103,6 @@ var featureNames = map[SnapdFeature]string{
 	RefreshAppAwareness:   "refresh-app-awareness",
 
 	ClassicPreservesXdgRuntimeDir: "classic-preserves-xdg-runtime-dir",
-	RobustMountNamespaceUpdates:   "robust-mount-namespace-updates",
 
 	UserDaemons:    "user-daemons",
 	DbusActivation: "dbus-activation",
@@ -133,7 +130,6 @@ var featureNames = map[SnapdFeature]string{
 var featuresEnabledWhenUnset = map[SnapdFeature]bool{
 	Layouts:                       true,
 	RefreshAppAwareness:           true,
-	RobustMountNamespaceUpdates:   true,
 	ClassicPreservesXdgRuntimeDir: true,
 	DbusActivation:                true,
 }
@@ -145,7 +141,6 @@ var featuresExported = map[SnapdFeature]bool{
 	ParallelInstances:     true,
 
 	ClassicPreservesXdgRuntimeDir: true,
-	RobustMountNamespaceUpdates:   true,
 	HiddenSnapDataHomeDir:         true,
 	MoveSnapHomeDir:               true,
 

diff --git a/features/features_test.go b/features/features_test.go
@@ -51,7 +51,6 @@ func (*featureSuite) TestName(c *C) {
 	check(features.PerUserMountNamespace, "per-user-mount-namespace")
 	check(features.RefreshAppAwareness, "refresh-app-awareness")
 	check(features.ClassicPreservesXdgRuntimeDir, "classic-preserves-xdg-runtime-dir")
-	check(features.RobustMountNamespaceUpdates, "robust-mount-namespace-updates")
 	check(features.UserDaemons, "user-daemons")
 	check(features.DbusActivation, "dbus-activation")
 	check(features.HiddenSnapDataHomeDir, "hidden-snap-folder")
@@ -92,7 +91,6 @@ func (*featureSuite) TestIsExported(c *C) {
 	check(features.PerUserMountNamespace, true)
 	check(features.RefreshAppAwareness, true)
 	check(features.ClassicPreservesXdgRuntimeDir, true)
-	check(features.RobustMountNamespaceUpdates, true)
 	check(features.UserDaemons, false)
 	check(features.DbusActivation, false)
 	check(features.HiddenSnapDataHomeDir, true)
@@ -218,7 +216,6 @@ func (*featureSuite) TestIsEnabledWhenUnset(c *C) {
 	check(features.PerUserMountNamespace, false)
 	check(features.RefreshAppAwareness, true)
 	check(features.ClassicPreservesXdgRuntimeDir, true)
-	check(features.RobustMountNamespaceUpdates, true)
 	check(features.UserDaemons, false)
 	check(features.DbusActivation, true)
 	check(features.HiddenSnapDataHomeDir, false)
@@ -240,7 +237,6 @@ func (*featureSuite) TestControlFile(c *C) {
 	c.Check(features.PerUserMountNamespace.ControlFile(), Equals, "/var/lib/snapd/features/per-user-mount-namespace")
 	c.Check(features.RefreshAppAwareness.ControlFile(), Equals, "/var/lib/snapd/features/refresh-app-awareness")
 	c.Check(features.ParallelInstances.ControlFile(), Equals, "/var/lib/snapd/features/parallel-instances")
-	c.Check(features.RobustMountNamespaceUpdates.ControlFile(), Equals, "/var/lib/snapd/features/robust-mount-namespace-updates")
 	c.Check(features.HiddenSnapDataHomeDir.ControlFile(), Equals, "/var/lib/snapd/features/hidden-snap-folder")
 	c.Check(features.MoveSnapHomeDir.ControlFile(), Equals, "/var/lib/snapd/features/move-snap-home-dir")
 	c.Check(features.RefreshAppAwarenessUX.ControlFile(), Equals, "/var/lib/snapd/features/refresh-app-awareness-ux")

diff --git a/tests/regression/lp-1844496/task.yaml b/tests/regression/lp-1844496/task.yaml
@@ -12,9 +12,6 @@ details: |
     essence of a failure encountered in the field by a real snap application
     package, in order to show that the failure no longer occurs.
 
-    Historically this test also enabled the robust-mount-namespace-updates feature,
-    but it is now enabled by default.
-
     This test is related to lp-1844496, lp-1852361 and lp-1867193.
 
 prepare: |

diff --git a/tests/regression/lp-1852361/task.yaml b/tests/regression/lp-1852361/task.yaml
@@ -12,9 +12,6 @@ details: |
     essence of a failure encountered in the field by a real snap application
     package, in order to show that the failure no longer occurs.
 
-    Historically this test also enabled the robust-mount-namespace-updates feature,
-    but it is now enabled by default.
-
     This test is related to lp-1844496, lp-1852361 and lp-1867193.
 
 environment:

diff --git a/tests/regression/lp-1867193/task.yaml b/tests/regression/lp-1867193/task.yaml
@@ -12,9 +12,6 @@ details: |
     essence of a failure encountered in the field by a real snap application
     package, in order to show that the failure no longer occurs.
 
-    Historically this test also enabled the robust-mount-namespace-updates feature,
-    but it is now enabled by default.
-
     This test is related to lp-1844496, lp-1852361 and lp-1867193.
 
 systems: [ubuntu-18.04-64] # tight coupling with container guest

diff --git a/tests/regression/lp-1867752/task.yaml b/tests/regression/lp-1867752/task.yaml
@@ -14,9 +14,6 @@ details: |
     namespace updates was made aware of that corner-case and the error would
     not longer cause issues with snap package removal.
 
-    Historically this test also enabled the robust-mount-namespace-updates feature,
-    but it is now enabled by default.
-
 systems: [ubuntu-18.04-64] # tight coupling with container guest
 
 prepare: |