Module: check_mk
Branch: master
Commit: 61c6031197ea679dc62455c8da088e7921baf00f
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=61c6031197ea67…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Fri Sep 1 13:18:32 2017 +0200
5170 FIX Removed TMPFS config hook
The "omd config" setting TMPFS, which could be used to disable the ramdisk that
is mounted
below /omd/sites/[site]/tmp, has been removed now. The option was added for rare
situations
where you could not create/mount ramdisks via tmpfs.
Because not using a tmpfs could result in loss of performance we remove this setting now.
In
case you really need sites without tmpfs, please let us know.
Change-Id: Ie2f06a5a3ac55f20d8f7c2a46080b3d724695712
---
.werks/5170 | 15 +++++++++++++++
omd/packages/omd/TMPFS.hook | 25 -------------------------
omd/packages/omd/omd | 32 +++++++++-----------------------
3 files changed, 24 insertions(+), 48 deletions(-)
diff --git a/.werks/5170 b/.werks/5170
new file mode 100644
index 0000000..d3f2e04
--- /dev/null
+++ b/.werks/5170
@@ -0,0 +1,15 @@
+Title: Removed TMPFS config hook
+Level: 1
+Component: omd
+Compatible: compat
+Edition: cre
+Version: 1.5.0i1
+Date: 1504264521
+Class: fix
+
+The "omd config" setting TMPFS, which could be used to disable the ramdisk that
is mounted
+below /omd/sites/[site]/tmp, has been removed now. The option was added for rare
situations
+where you could not create/mount ramdisks via tmpfs.
+
+Because not using a tmpfs could result in loss of performance we remove this setting now.
In
+case you really need sites without tmpfs, please let us know.
diff --git a/omd/packages/omd/TMPFS.hook b/omd/packages/omd/TMPFS.hook
deleted file mode 100755
index 350221d..0000000
--- a/omd/packages/omd/TMPFS.hook
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/bash
-
-# Alias: Use a ramdisk for temporary files
-# Menu: Basic
-# This settings decides, wether this site uses a ramdisk for
-# temporary files. Using a ramdisk reduces disk IO produced
-# during monitoring dramatically. It is highly recommended to
-# leave this option enabled. Only disable this if you really
-# need to.
-
-case "$1" in
- default)
- echo "on"
- ;;
- choices)
- echo "on: Use a ramdisk for temporary files"
- echo "off: Do not use a ramdisk within this site"
- ;;
- set)
- # Unmount the tmpfs when it was mounted before
- if [ "$2" == "off" ]; then
- omd umount
- fi
- ;;
-esac
diff --git a/omd/packages/omd/omd b/omd/packages/omd/omd
index 00bd200..cca5b31 100644
--- a/omd/packages/omd/omd
+++ b/omd/packages/omd/omd
@@ -1514,30 +1514,16 @@ def tmpfs_mounted(sitename):
def prepare_and_populate_tmpfs(sitename):
tmp = tmp_dir(sitename)
- # Only try to mount the tmpfs if it is enabled for this site
- # When not using the tmpfs the tmp/ hierarchy needs to be
- # to be populated like the tmpfs afterwards.
- if g_site_conf["TMPFS"] == "on":
- if tmpfs_mounted(sitename):
- return
-
- sys.stdout.write("Creating temporary filesystem %s..." % tmp)
- sys.stdout.flush()
- if not os.path.exists(tmp):
- os.mkdir(tmp)
- if 0 != os.system("mount %s '%s'" %
(g_info["MOUNT_OPTIONS"], tmp) ):
- sys.stdout.write(tty_error + "\n")
- return
- else:
- # Skip initializing when either the tmp dir does not exist
- # and the site is not totally stopped
- if os.path.exists(tmp) and not site_is_stopped(sitename):
- return
+ if tmpfs_mounted(sitename):
+ return
- sys.stdout.write("Preparing tmp directory %s..." % tmp)
- sys.stdout.flush()
- if not os.path.exists(tmp):
- os.mkdir(tmp)
+ sys.stdout.write("Creating temporary filesystem %s..." % tmp)
+ sys.stdout.flush()
+ if not os.path.exists(tmp):
+ os.mkdir(tmp)
+ if 0 != os.system("mount %s '%s'" %
(g_info["MOUNT_OPTIONS"], tmp) ):
+ sys.stdout.write(tty_error + "\n")
+ return
create_skeleton_files(sitename, "tmp")
chown_tree(tmp, sitename)