Skip to content

Deferred deletion check: support RHEL7.4+ kernels#4

Merged
mbentley merged 1 commit intombentley:masterfrom
kolyshkin:rhel74
Sep 28, 2017
Merged

Deferred deletion check: support RHEL7.4+ kernels#4
mbentley merged 1 commit intombentley:masterfrom
kolyshkin:rhel74

Conversation

@kolyshkin
Copy link
Copy Markdown
Contributor

These kernels have the feature for deferred deletion built-in
but disabled by default. A sysctl knob is available to turn it on.

This patch checks if the knob is available but not enabled -- in
this case case it enables it for the duration of the test and gives
a user a recommendation on how to enable it permanently.

BEFORE

[root@kir-ce73-gd docker-devicemapper-setup]#
./deferred_deletion_check/standalone_deferred_deletion_check.sh
Kernel version: 3.10.0-693.2.2.el7.x86_64
Deferred deletion is not supported

AFTER

[root@kir-ce73-gd docker-devicemapper-setup]#
./deferred_deletion_check/standalone_deferred_deletion_check.sh
Kernel version: 3.10.0-693.2.2.el7.x86_64

WARNING: it seems you are using RHEL/CentOS 7.4+ kernel but the
fs.may_detach_mounts sysfs setting is disabled (set to 0).

Setting fs.may_detach_mounts = 1 for the duration of the test.

To enable this permanently, run the following:

	echo "fs.may_detach_mounts=1" | sudo tee -a
/etc/sysctl.d/90-docker.conf
	sudo sysctl -f /etc/sysctl.d/90-docker.conf

Deferred deletion is supported

[v2: drop use of trap as it's used elsewhere]

Signed-off-by: Kir Kolyshkin [email protected]

These kernels have the feature for deferred deletion built-in
but disabled by default. A sysctl knob is available to turn it on.

This patch checks if the knob is available but not enabled -- in
this case case it enables it for the duration of the test and gives
a user a recommendation on how to enable it permanently.

	BEFORE:
```
[root@kir-ce73-gd docker-devicemapper-setup]#
./deferred_deletion_check/standalone_deferred_deletion_check.sh
Kernel version: 3.10.0-693.2.2.el7.x86_64
Deferred deletion is not supported
```
	AFTER:
```
[root@kir-ce73-gd docker-devicemapper-setup]#
./deferred_deletion_check/standalone_deferred_deletion_check.sh
Kernel version: 3.10.0-693.2.2.el7.x86_64

WARNING: it seems you are using RHEL/CentOS 7.4+ kernel but the
fs.may_detach_mounts sysfs setting is disabled (set to 0).

Setting fs.may_detach_mounts = 1 for the duration of the test.

To enable this permanently, run the following:

	echo "fs.may_detach_mounts=1" | sudo tee -a
/etc/sysctl.d/90-docker.conf
	sudo sysctl -f /etc/sysctl.d/90-docker.conf

Deferred deletion is supported
```

[v2: drop use of trap as it's used elsewhere]

Signed-off-by: Kir Kolyshkin <[email protected]>
Copy link
Copy Markdown
Owner

@mbentley mbentley left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, thanks and sorry for the delay!

@mbentley mbentley merged commit edfc959 into mbentley:master Sep 28, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants