1:34 a.m.
From: Royce Lv <lvroyce(a)linux.vnet.ibm.com>
v1>v2, move nfs checking to util to avoid misunderstanding.
This patchset solves following problem:
1. libvirt uses local directory when nfs target path is not accessible,
this patch denies this unaccessible path instead.
2. libvirt storage subsystem hang for a long period, with a quick checking,
storage pool operation will not hang if pre-checked.
3. Future access control check will do in prevalidation,
this prevents qemu manipulate storage pool of no read access to make early warning.
Royce Lv (2):
utils: Add nfs prevalication
Integrate nfs path check before create nfs pool
src/kimchi/model.py | 7 ++++++-
src/kimchi/utils.py | 38 ++++++++++++++++++++++++++++++++++++++
2 files changed, 44 insertions(+), 1 deletion(-)
--
1.8.1.2
--
project-kimchi mailing list <project-kimchi(a)googlegroups.com>
https://groups.google.com/forum/#!forum/project-kimchi
---
You received this message because you are subscribed to the Google Groups
"project-kimchi" group.
To unsubscribe from this group and stop receiving emails from it, send an email to
project-kimchi+unsubscribe(a)googlegroups.com.
For more options, visit https://groups.google.com/groups/opt_out.
1:34 a.m.
New subject: [project-kimchi][PATCHv2 1/2] utils: Add nfs prevalication
From: Royce Lv <lvroyce(a)linux.vnet.ibm.com>
Abstract a helper function to parse cmd result.
Usage:
(1)get cmd result with subprocess.call or subprocess.Popen
(2) call pass_cmd_output to get formated outputs
Example:
blkid = subprocess.Popen(["cat", "/proc/mounts"],
stdout=subprocess.PIPE, stderr=subprocess.PIPE)
outs = blkid.communicate()[0]
output_items= ['path', 'mnt_point', 'type', 'option']
utils.parse_cmd_output(outs, output_items)
Sample output:
[{'path': '/dev/sda8', 'type': 'ext4',
'option': 'rw,relatime,data=ordered', 'mnt_point':
'/home'},
{'path': 'localhost:/home/royce/isorepo', 'type':
'nfs4',
'option': 'rw...addr=127.0.0.1', 'mnt_point':
'/mnt'}]
To prevent future mount of nfs path will hang,
we will try nfs path with a quick mount,
if this check fails, report warning to user.
Signed-off-by: Royce Lv <lvroyce(a)linux.vnet.ibm.com>
---
src/kimchi/utils.py | 38 ++++++++++++++++++++++++++++++++++++++
1 file changed, 38 insertions(+)
diff --git a/src/kimchi/utils.py b/src/kimchi/utils.py
index f7eda93..14b9c8a 100644
--- a/src/kimchi/utils.py
+++ b/src/kimchi/utils.py
@@ -22,6 +22,9 @@
#
import cherrypy
+import subprocess
+import tempfile
+import threading
import os
@@ -84,3 +87,38 @@ def import_class(class_path):
def import_module(module_name):
return __import__(module_name, fromlist=[''])
+
+def parse_cmd_output(output, output_items):
+ res = []
+ for line in output.split("\n"):
+ res.append(dict(zip(output_items, line.split())))
+
+ return res
+
+def check_nfs_export(export_path):
+ res = False
+ outputs = None
+ mnt_point = tempfile.mkdtemp(dir='/tmp')
+ cmd = ["mount", "-o",
'soft,timeo=100,retrans=3,retry=0',
+ export_path, mnt_point]
+ proc = subprocess.Popen(cmd, stdout=subprocess.PIPE,
+ stderr=subprocess.PIPE)
+ thread = threading.Thread(target = proc.communicate)
+ thread.start()
+ thread.join(30)
+
+ if thread.is_alive():
+ proc.kill()
+ thread.join()
+
+ with open("/proc/mounts" , "rb") as f:
+ outputs = f.read()
+ output_items = ['dev_path', 'mnt_point', 'type']
+ mounts = parse_cmd_output(outputs, output_items)
+ for item in mounts:
+ if 'dev_path' in item and item['dev_path'] == export_path:
+ res = True
+ cmd = ["umount", "-f", export_path]
+ subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+
+ return res
--
1.8.1.2
--
project-kimchi mailing list <project-kimchi(a)googlegroups.com>
https://groups.google.com/forum/#!forum/project-kimchi
---
You received this message because you are subscribed to the Google Groups
"project-kimchi" group.
To unsubscribe from this group and stop receiving emails from it, send an email to
project-kimchi+unsubscribe(a)googlegroups.com.
For more options, visit https://groups.google.com/groups/opt_out.
1:34 a.m.
New subject: [project-kimchi][PATCHv2 2/2] Integrate nfs path check before create nfs pool
From: Royce Lv <lvroyce(a)linux.vnet.ibm.com>
Before creating nfs pool, add a prevalidation for the path
and see if it is able to complish a quick mount.
If not, deny this storage pool from being created.
Signed-off-by: Royce Lv <lvroyce(a)linux.vnet.ibm.com>
---
src/kimchi/model.py | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/src/kimchi/model.py b/src/kimchi/model.py
index 73c18ac..705e768 100644
--- a/src/kimchi/model.py
+++ b/src/kimchi/model.py
@@ -69,7 +69,7 @@ from kimchi.networkxml import to_network_xml
from kimchi.objectstore import ObjectStore
from kimchi.scan import Scanner
from kimchi.screenshot import VMScreenshot
-from kimchi.utils import kimchi_log, is_digit, get_enabled_plugins
+from kimchi.utils import kimchi_log, is_digit, get_enabled_plugins, check_nfs_export
from kimchi.vmtemplate import VMTemplate
@@ -991,6 +991,11 @@ class Model(object):
if params['type'] == 'kimchi-iso':
task_id = self._do_deep_scan(params)
+ if params['type'] == 'netfs':
+ export_path = params['nfsserver'] + ':' +
params['nfspath']
+ if not check_nfs_export(export_path):
+ raise InvalidParameter(
+ "Export path %s may block during nfs mount" %
export_path)
xml = _get_pool_xml(**params)
except KeyError, key:
raise MissingParameter(key)
--
1.8.1.2
--
project-kimchi mailing list <project-kimchi(a)googlegroups.com>
https://groups.google.com/forum/#!forum/project-kimchi
---
You received this message because you are subscribed to the Google Groups
"project-kimchi" group.
To unsubscribe from this group and stop receiving emails from it, send an email to
project-kimchi+unsubscribe(a)googlegroups.com.
For more options, visit https://groups.google.com/groups/opt_out.
4:34 a.m.
New subject: [project-kimchi][PATCHv2 1/2] utils: Add nfs prevalication
Reviewed-by: Aline Manera <alinefm(a)linux.vnet.ibm.com>
On 12/18/2013 07:34 AM, lvroyce(a)linux.vnet.ibm.com wrote:
From: Royce Lv <lvroyce(a)linux.vnet.ibm.com>
Abstract a helper function to parse cmd result.
Usage:
(1)get cmd result with subprocess.call or subprocess.Popen
(2) call pass_cmd_output to get formated outputs
Example:
blkid = subprocess.Popen(["cat", "/proc/mounts"],
stdout=subprocess.PIPE, stderr=subprocess.PIPE)
outs = blkid.communicate()[0]
output_items= ['path', 'mnt_point', 'type',
'option']
utils.parse_cmd_output(outs, output_items)
Sample output:
[{'path': '/dev/sda8', 'type': 'ext4',
'option': 'rw,relatime,data=ordered', 'mnt_point':
'/home'},
{'path': 'localhost:/home/royce/isorepo', 'type':
'nfs4',
'option': 'rw...addr=127.0.0.1', 'mnt_point':
'/mnt'}]
To prevent future mount of nfs path will hang,
we will try nfs path with a quick mount,
if this check fails, report warning to user.
Signed-off-by: Royce Lv <lvroyce(a)linux.vnet.ibm.com>
---
src/kimchi/utils.py | 38 ++++++++++++++++++++++++++++++++++++++
1 file changed, 38 insertions(+)
diff --git a/src/kimchi/utils.py b/src/kimchi/utils.py
index f7eda93..14b9c8a 100644
--- a/src/kimchi/utils.py
+++ b/src/kimchi/utils.py
@@ -22,6 +22,9 @@
#
import cherrypy
+import subprocess
+import tempfile
+import threading
import os
@@ -84,3 +87,38 @@ def import_class(class_path):
def import_module(module_name):
return __import__(module_name, fromlist=[''])
+
+def parse_cmd_output(output, output_items):
+ res = []
+ for line in output.split("\n"):
+ res.append(dict(zip(output_items, line.split())))
+
+ return res
+
+def check_nfs_export(export_path):
+ res = False
+ outputs = None
+ mnt_point = tempfile.mkdtemp(dir='/tmp')
+ cmd = ["mount", "-o",
'soft,timeo=100,retrans=3,retry=0',
+ export_path, mnt_point]
+ proc = subprocess.Popen(cmd, stdout=subprocess.PIPE,
+ stderr=subprocess.PIPE)
+ thread = threading.Thread(target = proc.communicate)
+ thread.start()
+ thread.join(30)
+
+ if thread.is_alive():
+ proc.kill()
+ thread.join()
+
+ with open("/proc/mounts" , "rb") as f:
+ outputs = f.read()
+ output_items = ['dev_path', 'mnt_point', 'type']
+ mounts = parse_cmd_output(outputs, output_items)
+ for item in mounts:
+ if 'dev_path' in item and item['dev_path'] == export_path:
+ res = True
+ cmd = ["umount", "-f", export_path]
+ subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+
+ return res
--
project-kimchi mailing list <project-kimchi(a)googlegroups.com>
https://groups.google.com/forum/#!forum/project-kimchi
---
You received this message because you are subscribed to the Google Groups
"project-kimchi" group.
To unsubscribe from this group and stop receiving emails from it, send an email to
project-kimchi+unsubscribe(a)googlegroups.com.
For more options, visit https://groups.google.com/groups/opt_out.
4:35 a.m.
New subject: [project-kimchi][PATCHv2 2/2] Integrate nfs path check before create nfs pool
Reviewed-by: Aline Manera <alinefm(a)linux.vnet.ibm.com>
On 12/18/2013 07:34 AM, lvroyce(a)linux.vnet.ibm.com wrote:
From: Royce Lv <lvroyce(a)linux.vnet.ibm.com>
Before creating nfs pool, add a prevalidation for the path
and see if it is able to complish a quick mount.
If not, deny this storage pool from being created.
Signed-off-by: Royce Lv <lvroyce(a)linux.vnet.ibm.com>
---
src/kimchi/model.py | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/src/kimchi/model.py b/src/kimchi/model.py
index 73c18ac..705e768 100644
--- a/src/kimchi/model.py
+++ b/src/kimchi/model.py
@@ -69,7 +69,7 @@ from kimchi.networkxml import to_network_xml
from kimchi.objectstore import ObjectStore
from kimchi.scan import Scanner
from kimchi.screenshot import VMScreenshot
-from kimchi.utils import kimchi_log, is_digit, get_enabled_plugins
+from kimchi.utils import kimchi_log, is_digit, get_enabled_plugins, check_nfs_export
from kimchi.vmtemplate import VMTemplate
@@ -991,6 +991,11 @@ class Model(object):
if params['type'] == 'kimchi-iso':
task_id = self._do_deep_scan(params)
+ if params['type'] == 'netfs':
+ export_path = params['nfsserver'] + ':' +
params['nfspath']
+ if not check_nfs_export(export_path):
+ raise InvalidParameter(
+ "Export path %s may block during nfs mount" %
export_path)
xml = _get_pool_xml(**params)
except KeyError, key:
raise MissingParameter(key)
--
project-kimchi mailing list <project-kimchi(a)googlegroups.com>
https://groups.google.com/forum/#!forum/project-kimchi
---
You received this message because you are subscribed to the Google Groups
"project-kimchi" group.
To unsubscribe from this group and stop receiving emails from it, send an email to
project-kimchi+unsubscribe(a)googlegroups.com.
For more options, visit https://groups.google.com/groups/opt_out.
3783
days inactive
3783
days old
4 comments
2 participants
participants (2)
-
Aline Manera -
lvroyce＠linux.vnet.ibm.com