* [PATCH 0/2] V4 Disk space monitoring
@ 2012-02-20 9:53 Robert Yang
2012-02-20 9:53 ` [PATCH 1/2] " Robert Yang
2012-02-20 9:53 ` [PATCH 2/2] V4 Add config sample for disk " Robert Yang
0 siblings, 2 replies; 6+ messages in thread
From: Robert Yang @ 2012-02-20 9:53 UTC (permalink / raw)
To: bitbake-devel
Hi Richard,
Here is V4, the main changes are:
1) Can set each directory's threshold separately
2) Can choose the action when the disk space is running low:
a) Warn
b) No new task
c) Abort
3) Change the time interval to disk space(or inode) interval, the reason
is:
If we use the time interval, then we need a timer, and the timer
should be actived when the runqueue starts, and it should combine
closely with the runqueue since it it needs controll the task(no new
task), and the timer should in the subprocess, otherewise it would
block the runqueue, it seems hard to terminate to pass the Ctrl-C
to the subprocess since the Ctrl-C is captured by the ui, so I change
the time interval to the disk space(or inode) interval, this seems
more reasonable than the time interval, it would only warn when the
disk space reduce more than the interval, for example, if the interval
is 10M, it would warn when the space is lower than the threshold, and
warn again when the space reduce more than 10M.
4) The testing result: (The action would be executed when the space or inode
is lower than the threshold):
a) When the space is running low:
BB_DISKMON_DIRS = "${TMPDIR},130G,20M"
i) BB_DISKMON_ACTION = "WARN"
WARNING: The free space of /dev/sdb4 is running low (119.700GB left)
...
The build will go on, and will warn again when the disk space reduces
more than interval.
ii) BB_DISKMON_ACTION = "NO_NEW_TASK"
WARNING: The free space of /dev/sdb4 is running low (119.689GB left)
WARNING: No new tasks can be excuted since BB_DISKMON_ACTION = "NO_NEW_TASK"!
The build will stop after other tasks has been done
iii) WARNING: The free space of /dev/sdb4 is running low (119.689GB left)
ERROR: Immediately abort since BB_DISKMON_ACTION = "ABORT"!
The build will stop immediately.
b) The similar to the inode, and also the similar to more than one disks
are monitored.
// Robert
The following changes since commit 41a83ccfe50ec69425a4828fb5836d38d3f99e67:
guile: fix cross configure failure (2012-02-10 17:01:42 +0000)
are available in the git repository at:
git://git.pokylinux.org/poky-contrib robert/disk-space-monitor
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=robert/disk-space-monitor
Robert Yang (2):
Disk space monitoring
Add config sample for disk space monitoring
bitbake/bin/bitbake | 1 +
bitbake/lib/bb/monitordisk.py | 177 +++++++++++++++++++++++++++++++++++++
bitbake/lib/bb/runqueue.py | 67 +++++++++++++-
meta-yocto/conf/local.conf.sample | 29 ++++++
4 files changed, 271 insertions(+), 3 deletions(-)
create mode 100644 bitbake/lib/bb/monitordisk.py
--
1.7.4.1
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 1/2] V4 Disk space monitoring
2012-02-20 9:53 [PATCH 0/2] V4 Disk space monitoring Robert Yang
@ 2012-02-20 9:53 ` Robert Yang
2012-02-22 17:28 ` Richard Purdie
2012-02-20 9:53 ` [PATCH 2/2] V4 Add config sample for disk " Robert Yang
1 sibling, 1 reply; 6+ messages in thread
From: Robert Yang @ 2012-02-20 9:53 UTC (permalink / raw)
To: bitbake-devel
Monitor disk availability and take action when the free disk space or
amount of free inode is running low, it is enabled when BB_DISKMON_DIRS
is set.
* Variable meanings(from meta-yocto/conf/local.conf.sample):
# Set the directories to monitor for disk usage, if more than one
# directories are mounted in the same device, then only one directory
# would be monitored since the monitor is based on the device.
# The format are: "directory,minimum space,minimum free inode",
# either space or inode (Or both of them) should be specified, otherwise
# the monitor would not be enabled, the unit can be G, M, K or none,
# but do NOT use GB, MB or KB (B is not needed).
#BB_DISKMON_DIRS = "${TMPDIR},1G,1K ${SSTATE_DIR},500M,1K"
#
# Set the action when the space is running low, the action is one of:
# ABORT: Immediately abort
# NO_NEW_TASK: no new tasks
# WARN: show warnings
# The default is WARN
#BB_DISKMON_ACTION = "WARN"
#
# Set disk space and inode interval, the unit can be G, M, or K, but do
# NOT use the GB, MB or KB (B is not needed), the format is:
# "disk space interval, disk inode interval", the default value is
# "10M, 50" which means that it would warn when the free space is
# lower than the minimum space(or inode), and would repeat the action
# when the disk space reduces 10M (or the amount of inode reduces 50)
# again.
#BB_DISKMON_INTERVAL = "10M,10K"
[YOCTO #1589]
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
bitbake/bin/bitbake | 1 +
bitbake/lib/bb/monitordisk.py | 177 +++++++++++++++++++++++++++++++++++++++++
bitbake/lib/bb/runqueue.py | 67 +++++++++++++++-
3 files changed, 242 insertions(+), 3 deletions(-)
create mode 100644 bitbake/lib/bb/monitordisk.py
diff --git a/bitbake/bin/bitbake b/bitbake/bin/bitbake
index 6da4980..d295229 100755
--- a/bitbake/bin/bitbake
+++ b/bitbake/bin/bitbake
@@ -240,6 +240,7 @@ Default BBFILES are the .bb files in the current directory.""")
else:
print("server address: %s, server port: %s" % (server.serverinfo.host, server.serverinfo.port))
+
return 1
if __name__ == "__main__":
diff --git a/bitbake/lib/bb/monitordisk.py b/bitbake/lib/bb/monitordisk.py
new file mode 100644
index 0000000..2ea7bdb
--- /dev/null
+++ b/bitbake/lib/bb/monitordisk.py
@@ -0,0 +1,177 @@
+#!/usr/bin/env python
+# ex:ts=4:sw=4:sts=4:et
+# -*- tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*-
+#
+# Copyright (C) 2012 Robert Yang
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2 as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+import time, os, logging, re, sys
+import bb
+logger = logging.getLogger("BitBake.Monitor")
+
+def errRet(info):
+ logger.error("%s" % info)
+ logger.error("Disk space monitor will NOT be enabled")
+ return None
+
+def errRetTwo(info):
+ logger.error("%s" % info)
+ logger.error("Disk space monitor will NOT be enabled")
+ return None, None
+
+def convertGMK(unit):
+
+ """ Convert the space unit G, M, K, the unit is case-insensitive """
+
+ unitG = re.match('([1-9][0-9]*)[gG]\s?$', unit)
+ if unitG:
+ return int(unitG.group(1)) * (1024 ** 3)
+ unitM = re.match('([1-9][0-9]*)[mM]\s?$', unit)
+ if unitM:
+ return int(unitM.group(1)) * (1024 ** 2)
+ unitK = re.match('([1-9][0-9]*)[kK]\s?$', unit)
+ if unitK:
+ return int(unitK.group(1)) * 1024
+ unitN = re.match('([1-9][0-9]*)\s?$', unit)
+ if unitN:
+ return int(unitN.group(1))
+ else:
+ return None
+
+def getMountedDev(path):
+
+ """ Get the device mounted at the path, uses /proc/mounts """
+
+ # Get the mount point of the filesystem containing path
+ # st_dev is the ID of device containing file
+ parentDev = os.stat(path).st_dev
+ currentDev = parentDev
+ # When the current directory's device is different from the
+ # parrent's, then the current directory is a mount point
+ while parentDev == currentDev:
+ mountPoint = path
+ # Use dirname to get the parrent's directory
+ path = os.path.dirname(path)
+ # Reach the "/"
+ if path == mountPoint:
+ break
+ parentDev= os.stat(path).st_dev
+
+ try:
+ with open("/proc/mounts", "r") as ifp:
+ for line in ifp:
+ procLines = line.rstrip('\n').split()
+ if procLines[1] == mountPoint:
+ return procLines[0]
+ except EnvironmentError:
+ pass
+ return None
+
+def getDiskData(BBDirs, configuration):
+
+ """Prepare disk data for disk space monitor"""
+
+ # Save the device IDs, need the ID to be unique (the dictionary's key is
+ # unique), so that when more than one directories are located in the same
+ # device, we just monitor it once
+ devDict = {}
+ for pathSpaceInode in BBDirs.split():
+ # The input format is: "dir,space,inode", dir is a must, space
+ # and inode are optional
+ pathSpaceInodeRe = re.match('([^,]*),([^,]*),?(.*)', pathSpaceInode)
+ if not pathSpaceInodeRe:
+ errRet("Invalid value in BB_DISKMON_DIRS: %s" % pathSpaceInode)
+ path = os.path.realpath(pathSpaceInodeRe.group(1))
+ if not path:
+ errRet("Invalid path value in BB_DISKMON_DIRS: %s" % pathSpaceInode)
+ minSpace = pathSpaceInodeRe.group(2)
+ # The disk space or inode is optional, but it should have a correct
+ # value once it is specified
+ if minSpace:
+ minSpace = convertGMK(minSpace)
+ if not minSpace:
+ errRet("Invalid disk space value in BB_DISKMON_DIRS: %s" % pathSpaceInodeRe.group(2))
+ else:
+ # 0 means that it is not specified
+ minSpace = None
+
+ minInode = pathSpaceInodeRe.group(3)
+ if minInode:
+ minInode = convertGMK(minInode)
+ if not minInode:
+ errRet("Invalid inode value in BB_DISKMON_DIRS: %s" % pathSpaceInodeRe.group(3))
+ else:
+ # 0 means that it is not specified
+ minInode = None
+
+ if minSpace is None and minInode is None:
+ errRet("No disk space or inode value in found BB_DISKMON_DIRS: %s" % pathSpaceInode)
+ # mkdir for the directory since it may not exist, for example the
+ # DL_DIR may not exist at the very beginning
+ if not os.path.exists(path):
+ bb.utils.mkdirhier(path)
+ mountedDev = getMountedDev(path)
+ devDict[mountedDev] = path, minSpace, minInode
+ return devDict
+
+def getAction(configuration):
+
+ """ Get the disk space monitor action"""
+
+ action = configuration.getVar("BB_DISKMON_ACTION", 1) or "WARN"
+ if action not in ("ABORT", "NO_NEW_TASK", "WARN"):
+ errRet("Unknown disk space monitor action: %s" % self.action)
+ else:
+ return action
+
+def getInterval(configuration):
+
+ """ Get the disk space interval """
+ interval = configuration.getVar("BB_DISKMON_INTERVAL", 1)
+ if not interval:
+ # The default value is 10M and 50.
+ return 10 * 1024 * 1024, 50
+ else:
+ # The disk space or inode is optional, but it should have a
+ # correct value once it is specified
+ intervalRe = re.match('([^,]*),?\s*(.*)', interval)
+ if intervalRe:
+ intervalSpace = intervalRe.group(1)
+ if intervalSpace:
+ intervalSpace = convertGMK(intervalSpace)
+ if not intervalSpace:
+ errRetTwo("Invalid disk space interval value in BB_DISKMON_INTERVAL: %s" % intervalRe.group(1))
+ intervalInode = intervalRe.group(2)
+ if intervalInode:
+ intervalInode = convertGMK(intervalInode)
+ if not intervalInode:
+ errRetTwo("Invalid disk inode interval value in BB_DISKMON_INTERVAL: %s" % intervalRe.group(2))
+ return intervalSpace, intervalInode
+ else:
+ errRetTwo("Invalid interval value in BB_DISKMON_INTERVAL: %s" % interval)
+
+class diskMonitor:
+
+ """Prepare the disk space monitor data"""
+
+ def __init__(self, BBDirs, configuration):
+ self.enableMonitor = True
+ self.devDict = getDiskData(BBDirs, configuration)
+ self.action = getAction(configuration)
+ self.spaceInterval, self.inodeInterval = getInterval(configuration)
+ if self.devDict is None or self.action is None:
+ self.enableMonitor = False
+ if self.spaceInterval is None and self.inodeInterval is None:
+ self.enableMonitor = False
diff --git a/bitbake/lib/bb/runqueue.py b/bitbake/lib/bb/runqueue.py
index 7bf4320..0b4dcf0 100644
--- a/bitbake/lib/bb/runqueue.py
+++ b/bitbake/lib/bb/runqueue.py
@@ -31,6 +31,7 @@ import fcntl
import logging
import bb
from bb import msg, data, event
+from bb import monitordisk
bblogger = logging.getLogger("BitBake")
logger = logging.getLogger("BitBake.RunQueue")
@@ -771,6 +772,18 @@ class RunQueue:
self.state = runQueuePrepare
+ # For disk space monitor
+ self.diskMonDirs = cfgData.getVar("BB_DISKMON_DIRS", 1) or None
+ if self.diskMonDirs:
+ self.dm = monitordisk.diskMonitor(self.diskMonDirs, cfgData) or None
+ self.preFreeSpace = {}
+ self.preFreeInode = {}
+ for dev in self.dm.devDict:
+ self.preFreeSpace[dev] = 0
+ self.preFreeInode[dev] = 0
+ else:
+ self.dm = None
+
def check_stamps(self):
unchecked = {}
current = []
@@ -923,6 +936,40 @@ class RunQueue:
return iscurrent
+ def disk_monitor_action (self, devDict):
+
+ """ Tack action for the monitor """
+
+ for dev in devDict:
+ st = os.statvfs(devDict[dev][0])
+ # The free space, float point number
+ freeSpace = st.f_bavail * st.f_frsize
+ if devDict[dev][1] is not None and freeSpace < devDict[dev][1]:
+ # Always show warning, and this is the default "WARN" action
+ if self.preFreeSpace[dev] == 0 or self.preFreeSpace[dev] - freeSpace > self.dm.spaceInterval:
+ logger.warn("The free space of %s is running low (%.3fGB left)" % (dev, freeSpace / 1024 / 1024 / 1024.0))
+ self.preFreeSpace[dev] = freeSpace
+ if self.dm.action == "NO_NEW_TASK":
+ logger.warn("No new tasks can be excuted since BB_DISKMON_ACTION = \"NO_NEW_TASK\"!")
+ return 1
+ elif self.dm.action == "ABORT":
+ logger.error("Immediately abort since BB_DISKMON_ACTION = \"ABORT\"!")
+ sys.exit(1)
+ # The free inodes, float point number
+ freeInode = st.f_favail
+ if devDict[dev][2] is not None and freeInode < devDict[dev][2]:
+ # Always show warning, and this is the default "WARN" action
+ if self.preFreeInode[dev] == 0 or self.preFreeInode[dev] - freeInode > self.dm.inodeInterval:
+ logger.warn("The free inode of %s is running low (%.3fK left)" % (dev, freeInode / 1024.0))
+ self.preFreeInode[dev] = freeInode
+ elif self.dm.action == "NO_NEW_TASK":
+ logger.warn("No new tasks can be excuted since BB_DISKMON_ACTION = \"NO_NEW_TASK\"!")
+ return 1
+ elif self.dm.action == "ABORT":
+ logger.error("Immediately abort since BB_DISKMON_ACTION = \"ABORT\"!")
+ sys.exit(1)
+ return 0
+
def execute_runqueue(self):
"""
Run the tasks in a queue prepared by rqdata.prepare()
@@ -946,7 +993,14 @@ class RunQueue:
self.rqexe = RunQueueExecuteScenequeue(self)
if self.state is runQueueSceneRun:
- retval = self.rqexe.execute()
+ if self.dm and self.dm.enableMonitor:
+ dm_action = self.disk_monitor_action(self.dm.devDict)
+ if dm_action == 1:
+ self.rqexe.finish()
+ else:
+ retval = self.rqexe.execute()
+ else:
+ retval = self.rqexe.execute()
if self.state is runQueueRunInit:
logger.info("Executing RunQueue Tasks")
@@ -954,10 +1008,17 @@ class RunQueue:
self.state = runQueueRunning
if self.state is runQueueRunning:
- retval = self.rqexe.execute()
+ if self.dm and self.dm.enableMonitor:
+ dm_action = self.disk_monitor_action(self.dm.devDict)
+ if dm_action == 1:
+ self.rqexe.finish()
+ else:
+ retval = self.rqexe.execute()
+ else:
+ retval = self.rqexe.execute()
if self.state is runQueueCleanUp:
- self.rqexe.finish()
+ self.rqexe.finish()
if self.state is runQueueComplete or self.state is runQueueFailed:
if self.rqexe.stats.failed:
--
1.7.4.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 2/2] V4 Add config sample for disk space monitoring
2012-02-20 9:53 [PATCH 0/2] V4 Disk space monitoring Robert Yang
2012-02-20 9:53 ` [PATCH 1/2] " Robert Yang
@ 2012-02-20 9:53 ` Robert Yang
1 sibling, 0 replies; 6+ messages in thread
From: Robert Yang @ 2012-02-20 9:53 UTC (permalink / raw)
To: bitbake-devel
Add config sample for disk space monitoring to
meta-yocto/conf/local.conf.sample
[YOCTO #1589]
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
meta-yocto/conf/local.conf.sample | 29 +++++++++++++++++++++++++++++
1 files changed, 29 insertions(+), 0 deletions(-)
diff --git a/meta-yocto/conf/local.conf.sample b/meta-yocto/conf/local.conf.sample
index 38507e3..33e6d7a 100644
--- a/meta-yocto/conf/local.conf.sample
+++ b/meta-yocto/conf/local.conf.sample
@@ -224,3 +224,32 @@ PATCHRESOLVE = "noop"
# track the version of this file when it was generated. This can safely be ignored if
# this doesn't mean anything to you.
CONF_VERSION = "1"
+
+#
+# Disk space monitor, take action when the disk space or the amount of
+# inode is running low, it is enabled when BB_DISKMON_DIRS is set.
+#
+# Set the directories to monitor for disk usage, if more than one
+# directories are mounted in the same device, then only one directory
+# would be monitored since the monitor is based on the device.
+# The format are: "directory,minimum space,minimum free inode",
+# either space or inode (Or both of them) should be specified, otherwise
+# the monitor would not be enabled, the unit can be G, M, K or none,
+# but do NOT use GB, MB or KB (B is not needed).
+#BB_DISKMON_DIRS = "${TMPDIR},1G,1K ${SSTATE_DIR},500M,1K"
+#
+# Set the action when the space is running low, the action is one of:
+# ABORT: Immediately abort
+# NO_NEW_TASK: no new tasks
+# WARN: show warnings
+# The default is WARN
+#BB_DISKMON_ACTION = "WARN"
+#
+# Set disk space and inode interval, the unit can be G, M, or K, but do
+# NOT use the GB, MB or KB (B is not needed), the format is:
+# "disk space interval, disk inode interval", the default value is
+# "10M, 50" which means that it would warn when the free space is
+# lower than the minimum space(or inode), and would repeat the action
+# when the disk space reduces 10M (or the amount of inode reduces 50)
+# again.
+#BB_DISKMON_INTERVAL = "10M,1K"
--
1.7.4.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH 1/2] V4 Disk space monitoring
2012-02-20 9:53 ` [PATCH 1/2] " Robert Yang
@ 2012-02-22 17:28 ` Richard Purdie
2012-02-25 11:08 ` Robert Yang
0 siblings, 1 reply; 6+ messages in thread
From: Richard Purdie @ 2012-02-22 17:28 UTC (permalink / raw)
To: Robert Yang; +Cc: bitbake-devel
Hi Robert,
On Mon, 2012-02-20 at 17:53 +0800, Robert Yang wrote:
> Monitor disk availability and take action when the free disk space or
> amount of free inode is running low, it is enabled when BB_DISKMON_DIRS
> is set.
I like the patch, this is a great improvement on previous versions. I
think there are some further tweaks we can make to finish it off though.
> * Variable meanings(from meta-yocto/conf/local.conf.sample):
>
> # Set the directories to monitor for disk usage, if more than one
> # directories are mounted in the same device, then only one directory
> # would be monitored since the monitor is based on the device.
> # The format are: "directory,minimum space,minimum free inode",
> # either space or inode (Or both of them) should be specified, otherwise
> # the monitor would not be enabled, the unit can be G, M, K or none,
> # but do NOT use GB, MB or KB (B is not needed).
> #BB_DISKMON_DIRS = "${TMPDIR},1G,1K ${SSTATE_DIR},500M,1K"
> #
> # Set the action when the space is running low, the action is one of:
> # ABORT: Immediately abort
> # NO_NEW_TASK: no new tasks
> # WARN: show warnings
> # The default is WARN
> #BB_DISKMON_ACTION = "WARN"
I like BB_DISKMON_DIRS. I was wondering if we should combine these
variable so you could do something like:
BB_DISKMON_DIRS = "STOPTASKS,${TMPDIR},1G,1K ABORT,${SSTATE_DIR},500M,1K"
STOPTASKS might be easier to parse than "NO_NEW_TASK". It also means
someone could set a warning threshold and a hard abort level too.
> # Set disk space and inode interval, the unit can be G, M, or K, but do
> # NOT use the GB, MB or KB (B is not needed), the format is:
> # "disk space interval, disk inode interval", the default value is
> # "10M, 50" which means that it would warn when the free space is
> # lower than the minimum space(or inode), and would repeat the action
> # when the disk space reduces 10M (or the amount of inode reduces 50)
> # again.
> #BB_DISKMON_INTERVAL = "10M,10K"
I'm wondering how useful this interval is? Surely once we've warned,
aborted or stopped starting new tasks, running the action again isn't
much use? This is particularly true with the change I'm proposing above.
> [YOCTO #1589]
> Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
> ---
> bitbake/bin/bitbake | 1 +
> bitbake/lib/bb/monitordisk.py | 177 +++++++++++++++++++++++++++++++++++++++++
> bitbake/lib/bb/runqueue.py | 67 +++++++++++++++-
> 3 files changed, 242 insertions(+), 3 deletions(-)
> create mode 100644 bitbake/lib/bb/monitordisk.py
>
> diff --git a/bitbake/bin/bitbake b/bitbake/bin/bitbake
> index 6da4980..d295229 100755
> --- a/bitbake/bin/bitbake
> +++ b/bitbake/bin/bitbake
> @@ -240,6 +240,7 @@ Default BBFILES are the .bb files in the current directory.""")
> else:
> print("server address: %s, server port: %s" % (server.serverinfo.host, server.serverinfo.port))
>
> +
> return 1
>
> if __name__ == "__main__":
I suspect this shouldn't have been here :)
> diff --git a/bitbake/lib/bb/monitordisk.py b/bitbake/lib/bb/monitordisk.py
> new file mode 100644
> index 0000000..2ea7bdb
> --- /dev/null
> +++ b/bitbake/lib/bb/monitordisk.py
> @@ -0,0 +1,177 @@
> +#!/usr/bin/env python
> +# ex:ts=4:sw=4:sts=4:et
> +# -*- tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*-
> +#
> +# Copyright (C) 2012 Robert Yang
> +#
> +# This program is free software; you can redistribute it and/or modify
> +# it under the terms of the GNU General Public License version 2 as
> +# published by the Free Software Foundation.
> +#
> +# This program is distributed in the hope that it will be useful,
> +# but WITHOUT ANY WARRANTY; without even the implied warranty of
> +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
> +# GNU General Public License for more details.
> +#
> +# You should have received a copy of the GNU General Public License along
> +# with this program; if not, write to the Free Software Foundation, Inc.,
> +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
> +
> +import time, os, logging, re, sys
> +import bb
> +logger = logging.getLogger("BitBake.Monitor")
> +
> +def errRet(info):
> + logger.error("%s" % info)
> + logger.error("Disk space monitor will NOT be enabled")
> + return None
> +
> +def errRetTwo(info):
> + logger.error("%s" % info)
> + logger.error("Disk space monitor will NOT be enabled")
> + return None, None
These should be one multiline logger.error() call (using \n for
newlines).
> +def convertGMK(unit):
> +
> + """ Convert the space unit G, M, K, the unit is case-insensitive """
> +
> + unitG = re.match('([1-9][0-9]*)[gG]\s?$', unit)
> + if unitG:
> + return int(unitG.group(1)) * (1024 ** 3)
> + unitM = re.match('([1-9][0-9]*)[mM]\s?$', unit)
> + if unitM:
> + return int(unitM.group(1)) * (1024 ** 2)
> + unitK = re.match('([1-9][0-9]*)[kK]\s?$', unit)
> + if unitK:
> + return int(unitK.group(1)) * 1024
> + unitN = re.match('([1-9][0-9]*)\s?$', unit)
> + if unitN:
> + return int(unitN.group(1))
> + else:
> + return None
> +
> +def getMountedDev(path):
> +
> + """ Get the device mounted at the path, uses /proc/mounts """
> +
> + # Get the mount point of the filesystem containing path
> + # st_dev is the ID of device containing file
> + parentDev = os.stat(path).st_dev
> + currentDev = parentDev
> + # When the current directory's device is different from the
> + # parrent's, then the current directory is a mount point
> + while parentDev == currentDev:
> + mountPoint = path
> + # Use dirname to get the parrent's directory
> + path = os.path.dirname(path)
> + # Reach the "/"
> + if path == mountPoint:
> + break
> + parentDev= os.stat(path).st_dev
> +
> + try:
> + with open("/proc/mounts", "r") as ifp:
> + for line in ifp:
> + procLines = line.rstrip('\n').split()
> + if procLines[1] == mountPoint:
> + return procLines[0]
> + except EnvironmentError:
> + pass
> + return None
> +
> +def getDiskData(BBDirs, configuration):
> +
> + """Prepare disk data for disk space monitor"""
> +
> + # Save the device IDs, need the ID to be unique (the dictionary's key is
> + # unique), so that when more than one directories are located in the same
> + # device, we just monitor it once
> + devDict = {}
> + for pathSpaceInode in BBDirs.split():
> + # The input format is: "dir,space,inode", dir is a must, space
> + # and inode are optional
> + pathSpaceInodeRe = re.match('([^,]*),([^,]*),?(.*)', pathSpaceInode)
> + if not pathSpaceInodeRe:
> + errRet("Invalid value in BB_DISKMON_DIRS: %s" % pathSpaceInode)
> + path = os.path.realpath(pathSpaceInodeRe.group(1))
> + if not path:
> + errRet("Invalid path value in BB_DISKMON_DIRS: %s" % pathSpaceInode)
> + minSpace = pathSpaceInodeRe.group(2)
> + # The disk space or inode is optional, but it should have a correct
> + # value once it is specified
> + if minSpace:
> + minSpace = convertGMK(minSpace)
> + if not minSpace:
> + errRet("Invalid disk space value in BB_DISKMON_DIRS: %s" % pathSpaceInodeRe.group(2))
> + else:
> + # 0 means that it is not specified
> + minSpace = None
> +
> + minInode = pathSpaceInodeRe.group(3)
> + if minInode:
> + minInode = convertGMK(minInode)
> + if not minInode:
> + errRet("Invalid inode value in BB_DISKMON_DIRS: %s" % pathSpaceInodeRe.group(3))
> + else:
> + # 0 means that it is not specified
> + minInode = None
> +
> + if minSpace is None and minInode is None:
> + errRet("No disk space or inode value in found BB_DISKMON_DIRS: %s" % pathSpaceInode)
> + # mkdir for the directory since it may not exist, for example the
> + # DL_DIR may not exist at the very beginning
> + if not os.path.exists(path):
> + bb.utils.mkdirhier(path)
> + mountedDev = getMountedDev(path)
> + devDict[mountedDev] = path, minSpace, minInode
> + return devDict
> +
> +def getAction(configuration):
> +
> + """ Get the disk space monitor action"""
> +
> + action = configuration.getVar("BB_DISKMON_ACTION", 1) or "WARN"
> + if action not in ("ABORT", "NO_NEW_TASK", "WARN"):
> + errRet("Unknown disk space monitor action: %s" % self.action)
> + else:
> + return action
> +
> +def getInterval(configuration):
> +
> + """ Get the disk space interval """
> + interval = configuration.getVar("BB_DISKMON_INTERVAL", 1)
> + if not interval:
> + # The default value is 10M and 50.
> + return 10 * 1024 * 1024, 50
> + else:
> + # The disk space or inode is optional, but it should have a
> + # correct value once it is specified
> + intervalRe = re.match('([^,]*),?\s*(.*)', interval)
> + if intervalRe:
> + intervalSpace = intervalRe.group(1)
> + if intervalSpace:
> + intervalSpace = convertGMK(intervalSpace)
> + if not intervalSpace:
> + errRetTwo("Invalid disk space interval value in BB_DISKMON_INTERVAL: %s" % intervalRe.group(1))
> + intervalInode = intervalRe.group(2)
> + if intervalInode:
> + intervalInode = convertGMK(intervalInode)
> + if not intervalInode:
> + errRetTwo("Invalid disk inode interval value in BB_DISKMON_INTERVAL: %s" % intervalRe.group(2))
> + return intervalSpace, intervalInode
> + else:
> + errRetTwo("Invalid interval value in BB_DISKMON_INTERVAL: %s" % interval)
> +
> +class diskMonitor:
> +
> + """Prepare the disk space monitor data"""
> +
> + def __init__(self, BBDirs, configuration):
> + self.enableMonitor = True
> + self.devDict = getDiskData(BBDirs, configuration)
> + self.action = getAction(configuration)
> + self.spaceInterval, self.inodeInterval = getInterval(configuration)
> + if self.devDict is None or self.action is None:
> + self.enableMonitor = False
> + if self.spaceInterval is None and self.inodeInterval is None:
> + self.enableMonitor = False
> diff --git a/bitbake/lib/bb/runqueue.py b/bitbake/lib/bb/runqueue.py
> index 7bf4320..0b4dcf0 100644
> --- a/bitbake/lib/bb/runqueue.py
> +++ b/bitbake/lib/bb/runqueue.py
> @@ -31,6 +31,7 @@ import fcntl
> import logging
> import bb
> from bb import msg, data, event
> +from bb import monitordisk
>
> bblogger = logging.getLogger("BitBake")
> logger = logging.getLogger("BitBake.RunQueue")
> @@ -771,6 +772,18 @@ class RunQueue:
>
> self.state = runQueuePrepare
>
> + # For disk space monitor
> + self.diskMonDirs = cfgData.getVar("BB_DISKMON_DIRS", 1) or None
> + if self.diskMonDirs:
> + self.dm = monitordisk.diskMonitor(self.diskMonDirs, cfgData) or None
> + self.preFreeSpace = {}
> + self.preFreeInode = {}
> + for dev in self.dm.devDict:
> + self.preFreeSpace[dev] = 0
> + self.preFreeInode[dev] = 0
> + else:
> + self.dm = None
> +
I'd like to properly modularise this code so the hook here would
unconditionally do something like:
self.dm = monitordisk.diskMonitor(self.diskMonDirs, cfgData)
and it would internally check the BB_DISKMON_DIRS variable.
> def check_stamps(self):
> unchecked = {}
> current = []
> @@ -923,6 +936,40 @@ class RunQueue:
>
> return iscurrent
>
> + def disk_monitor_action (self, devDict):
> +
> + """ Tack action for the monitor """
> +
> + for dev in devDict:
> + st = os.statvfs(devDict[dev][0])
> + # The free space, float point number
> + freeSpace = st.f_bavail * st.f_frsize
> + if devDict[dev][1] is not None and freeSpace < devDict[dev][1]:
> + # Always show warning, and this is the default "WARN" action
> + if self.preFreeSpace[dev] == 0 or self.preFreeSpace[dev] - freeSpace > self.dm.spaceInterval:
> + logger.warn("The free space of %s is running low (%.3fGB left)" % (dev, freeSpace / 1024 / 1024 / 1024.0))
> + self.preFreeSpace[dev] = freeSpace
> + if self.dm.action == "NO_NEW_TASK":
> + logger.warn("No new tasks can be excuted since BB_DISKMON_ACTION = \"NO_NEW_TASK\"!")
> + return 1
> + elif self.dm.action == "ABORT":
> + logger.error("Immediately abort since BB_DISKMON_ACTION = \"ABORT\"!")
> + sys.exit(1)
Please don't do this. There is a way to immediately abort the runqueue
by calling rq.finish_runqueue(True) (see cooker.py which does this).
The return one could probably also be a finish_runqueue(False) call.
> + # The free inodes, float point number
> + freeInode = st.f_favail
> + if devDict[dev][2] is not None and freeInode < devDict[dev][2]:
> + # Always show warning, and this is the default "WARN" action
> + if self.preFreeInode[dev] == 0 or self.preFreeInode[dev] - freeInode > self.dm.inodeInterval:
> + logger.warn("The free inode of %s is running low (%.3fK left)" % (dev, freeInode / 1024.0))
> + self.preFreeInode[dev] = freeInode
> + elif self.dm.action == "NO_NEW_TASK":
> + logger.warn("No new tasks can be excuted since BB_DISKMON_ACTION = \"NO_NEW_TASK\"!")
> + return 1
> + elif self.dm.action == "ABORT":
> + logger.error("Immediately abort since BB_DISKMON_ACTION = \"ABORT\"!")
> + sys.exit(1)
> + return 0
> +
I think all of the above function should become a function of "class
diskMonitor" in the other file.
> def execute_runqueue(self):
> """
> Run the tasks in a queue prepared by rqdata.prepare()
> @@ -946,7 +993,14 @@ class RunQueue:
> self.rqexe = RunQueueExecuteScenequeue(self)
>
> if self.state is runQueueSceneRun:
> - retval = self.rqexe.execute()
> + if self.dm and self.dm.enableMonitor:
> + dm_action = self.disk_monitor_action(self.dm.devDict)
> + if dm_action == 1:
> + self.rqexe.finish()
> + else:
> + retval = self.rqexe.execute()
> + else:
> + retval = self.rqexe.execute()
>
> if self.state is runQueueRunInit:
> logger.info("Executing RunQueue Tasks")
> @@ -954,10 +1008,17 @@ class RunQueue:
> self.state = runQueueRunning
>
> if self.state is runQueueRunning:
> - retval = self.rqexe.execute()
> + if self.dm and self.dm.enableMonitor:
> + dm_action = self.disk_monitor_action(self.dm.devDict)
> + if dm_action == 1:
> + self.rqexe.finish()
> + else:
> + retval = self.rqexe.execute()
> + else:
> + retval = self.rqexe.execute()
>
> if self.state is runQueueCleanUp:
> - self.rqexe.finish()
> + self.rqexe.finish()
>
> if self.state is runQueueComplete or self.state is runQueueFailed:
> if self.rqexe.stats.failed:
With the above changes, you can probably just put something like:
if self.state in [runQueueSceneRun, runQueueRunning, runQueueCleanUp]:
self.dm.check(self)
in above if self.state is runQueueCleanUp in execute_runqueue() since
calling the finish_runqueue() would change self.state
Cheers,
Richard
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 1/2] V4 Disk space monitoring
2012-02-22 17:28 ` Richard Purdie
@ 2012-02-25 11:08 ` Robert Yang
2012-02-25 11:51 ` Richard Purdie
0 siblings, 1 reply; 6+ messages in thread
From: Robert Yang @ 2012-02-25 11:08 UTC (permalink / raw)
To: Richard Purdie; +Cc: bitbake-devel
Hi Richard,
Thank you very much for your detailed review, I've fixed most of
them as you suggested except the following ones, and please see my
comments below.
On 02/23/2012 01:28 AM, Richard Purdie wrote:
> Hi Robert,
>
>> # Set disk space and inode interval, the unit can be G, M, or K, but do
>> # NOT use the GB, MB or KB (B is not needed), the format is:
>> # "disk space interval, disk inode interval", the default value is
>> # "10M, 50" which means that it would warn when the free space is
>> # lower than the minimum space(or inode), and would repeat the action
>> # when the disk space reduces 10M (or the amount of inode reduces 50)
>> # again.
>> #BB_DISKMON_INTERVAL = "10M,10K"
>
> I'm wondering how useful this interval is? Surely once we've warned,
> aborted or stopped starting new tasks, running the action again isn't
> much use? This is particularly true with the change I'm proposing above.
>
I think there are 3 actions we can do: WARN, STOPTASKS or ABORT, this is
only useful for "WARN", when the action is "WARN", there would be too many
WARNINGS without the interval value.
>> +def errRet(info):
>> + logger.error("%s" % info)
>> + logger.error("Disk space monitor will NOT be enabled")
>> + return None
>> +
>> +def errRetTwo(info):
>> + logger.error("%s" % info)
>> + logger.error("Disk space monitor will NOT be enabled")
>> + return None, None
>
> These should be one multiline logger.error() call (using \n for
> newlines).
>
Yes, I've fixed this, also combine errRet and errRetTwo into one
function printERR.
>> + for dev in devDict:
>> + st = os.statvfs(devDict[dev][0])
>> + # The free space, float point number
>> + freeSpace = st.f_bavail * st.f_frsize
>> + if devDict[dev][1] is not None and freeSpace< devDict[dev][1]:
>> + # Always show warning, and this is the default "WARN" action
>> + if self.preFreeSpace[dev] == 0 or self.preFreeSpace[dev] - freeSpace> self.dm.spaceInterval:
>> + logger.warn("The free space of %s is running low (%.3fGB left)" % (dev, freeSpace / 1024 / 1024 / 1024.0))
>> + self.preFreeSpace[dev] = freeSpace
>> + if self.dm.action == "NO_NEW_TASK":
>> + logger.warn("No new tasks can be excuted since BB_DISKMON_ACTION = \"NO_NEW_TASK\"!")
>> + return 1
>> + elif self.dm.action == "ABORT":
>> + logger.error("Immediately abort since BB_DISKMON_ACTION = \"ABORT\"!")
>> + sys.exit(1)
>
> Please don't do this. There is a way to immediately abort the runqueue
> by calling rq.finish_runqueue(True) (see cooker.py which does this).
>
> The return one could probably also be a finish_runqueue(False) call.
The finish_runqueue(False) works, but finish_runqueue(True) doesn't work
if there is no running task running(for example, when we use the
finish_runqueue(True) at the very beginning of the build), this is because
if there is no running taks, the function would do nothing. So I use:
rq.finish_runqueue(True)
return False
Then the build would always stop whether there is running tasks or not.
>> def execute_runqueue(self):
>> """
>> Run the tasks in a queue prepared by rqdata.prepare()
>> @@ -946,7 +993,14 @@ class RunQueue:
>> self.rqexe = RunQueueExecuteScenequeue(self)
>>
>> if self.state is runQueueSceneRun:
>> - retval = self.rqexe.execute()
>> + if self.dm and self.dm.enableMonitor:
>> + dm_action = self.disk_monitor_action(self.dm.devDict)
>> + if dm_action == 1:
>> + self.rqexe.finish()
>> + else:
>> + retval = self.rqexe.execute()
>> + else:
>> + retval = self.rqexe.execute()
>>
>> if self.state is runQueueRunInit:
>> logger.info("Executing RunQueue Tasks")
>> @@ -954,10 +1008,17 @@ class RunQueue:
>> self.state = runQueueRunning
>>
>> if self.state is runQueueRunning:
>> - retval = self.rqexe.execute()
>> + if self.dm and self.dm.enableMonitor:
>> + dm_action = self.disk_monitor_action(self.dm.devDict)
>> + if dm_action == 1:
>> + self.rqexe.finish()
>> + else:
>> + retval = self.rqexe.execute()
>> + else:
>> + retval = self.rqexe.execute()
>>
>> if self.state is runQueueCleanUp:
>> - self.rqexe.finish()
>> + self.rqexe.finish()
>>
>> if self.state is runQueueComplete or self.state is runQueueFailed:
>> if self.rqexe.stats.failed:
>
>
> With the above changes, you can probably just put something like:
>
> if self.state in [runQueueSceneRun, runQueueRunning, runQueueCleanUp]:
> self.dm.check(self)
>
This would make the code more clearer, I have moved most of the code to
lib/bb/monitordisk.py as you suggested, but since the rq.finish_runqueue(True)
doesn't work when there is no running task, I still need check the return
status of the monitor, now the code is:
if self.state in [runQueueSceneRun, runQueueRunning, runQueueCleanUp]:
if self.dm.enableMonitor:
dm_ret = self.dm.dm_action()
if dm_ret == 1:
self.finish_runqueue(False)
elif dm_ret == 2:
self.finish_runqueue(True)
return False
// Robert
> in above if self.state is runQueueCleanUp in execute_runqueue() since
> calling the finish_runqueue() would change self.state
>
> Cheers,
>
> Richard
>
>
>
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 1/2] V4 Disk space monitoring
2012-02-25 11:08 ` Robert Yang
@ 2012-02-25 11:51 ` Richard Purdie
0 siblings, 0 replies; 6+ messages in thread
From: Richard Purdie @ 2012-02-25 11:51 UTC (permalink / raw)
To: Robert Yang; +Cc: bitbake-devel
On Sat, 2012-02-25 at 19:08 +0800, Robert Yang wrote:
> Thank you very much for your detailed review, I've fixed most of
> them as you suggested except the following ones, and please see my
> comments below.
Thanks! (comments below)
> On 02/23/2012 01:28 AM, Richard Purdie wrote:
> > Hi Robert,
> >
> >> # Set disk space and inode interval, the unit can be G, M, or K, but do
> >> # NOT use the GB, MB or KB (B is not needed), the format is:
> >> # "disk space interval, disk inode interval", the default value is
> >> # "10M, 50" which means that it would warn when the free space is
> >> # lower than the minimum space(or inode), and would repeat the action
> >> # when the disk space reduces 10M (or the amount of inode reduces 50)
> >> # again.
> >> #BB_DISKMON_INTERVAL = "10M,10K"
> >
> > I'm wondering how useful this interval is? Surely once we've warned,
> > aborted or stopped starting new tasks, running the action again isn't
> > much use? This is particularly true with the change I'm proposing above.
> >
>
> I think there are 3 actions we can do: WARN, STOPTASKS or ABORT, this is
> only useful for "WARN", when the action is "WARN", there would be too many
> WARNINGS without the interval value.
Can we call it BB_DISKMON_WARNINTERVAL then?
> >> + for dev in devDict:
> >> + st = os.statvfs(devDict[dev][0])
> >> + # The free space, float point number
> >> + freeSpace = st.f_bavail * st.f_frsize
> >> + if devDict[dev][1] is not None and freeSpace< devDict[dev][1]:
> >> + # Always show warning, and this is the default "WARN" action
> >> + if self.preFreeSpace[dev] == 0 or self.preFreeSpace[dev] - freeSpace> self.dm.spaceInterval:
> >> + logger.warn("The free space of %s is running low (%.3fGB left)" % (dev, freeSpace / 1024 / 1024 / 1024.0))
> >> + self.preFreeSpace[dev] = freeSpace
> >> + if self.dm.action == "NO_NEW_TASK":
> >> + logger.warn("No new tasks can be excuted since BB_DISKMON_ACTION = \"NO_NEW_TASK\"!")
> >> + return 1
> >> + elif self.dm.action == "ABORT":
> >> + logger.error("Immediately abort since BB_DISKMON_ACTION = \"ABORT\"!")
> >> + sys.exit(1)
> >
> > Please don't do this. There is a way to immediately abort the runqueue
> > by calling rq.finish_runqueue(True) (see cooker.py which does this).
> >
> > The return one could probably also be a finish_runqueue(False) call.
>
> The finish_runqueue(False) works, but finish_runqueue(True) doesn't work
> if there is no running task running(for example, when we use the
> finish_runqueue(True) at the very beginning of the build), this is because
> if there is no running taks, the function would do nothing. So I use:
>
> rq.finish_runqueue(True)
> return False
>
> Then the build would always stop whether there is running tasks or not.
Ah, right. How about we add as a separate patch:
diff --git a/bitbake/lib/bb/runqueue.py b/bitbake/lib/bb/runqueue.py
index c24841f..09dab3d 100644
--- a/bitbake/lib/bb/runqueue.py
+++ b/bitbake/lib/bb/runqueue.py
@@ -1060,6 +1060,13 @@ class RunQueueExecute:
for pipe in self.build_pipes:
self.build_pipes[pipe].read()
+ if len(self.failed_fnids) != 0:
+ self.rq.state = runQueueFailed
+ return
+
+ self.rq.state = runQueueComplete
+ return
+
def finish(self):
self.rq.state = runQueueCleanUp
> This would make the code more clearer, I have moved most of the code to
> lib/bb/monitordisk.py as you suggested, but since the rq.finish_runqueue(True)
> doesn't work when there is no running task, I still need check the return
> status of the monitor, now the code is:
>
> if self.state in [runQueueSceneRun, runQueueRunning, runQueueCleanUp]:
> if self.dm.enableMonitor:
> dm_ret = self.dm.dm_action()
> if dm_ret == 1:
> self.finish_runqueue(False)
> elif dm_ret == 2:
> self.finish_runqueue(True)
> return False
See above, I think we can fix this! :)
Cheers,
Richard
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2012-02-25 11:59 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-02-20 9:53 [PATCH 0/2] V4 Disk space monitoring Robert Yang
2012-02-20 9:53 ` [PATCH 1/2] " Robert Yang
2012-02-22 17:28 ` Richard Purdie
2012-02-25 11:08 ` Robert Yang
2012-02-25 11:51 ` Richard Purdie
2012-02-20 9:53 ` [PATCH 2/2] V4 Add config sample for disk " Robert Yang
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.