From: Jos Collin <jcollin@redhat.com>
Date: Sun, 1 Sep 2019 16:07:21 +0000 (+0530)
Subject: mgr/volumes: prevent negative subvolume size
X-Git-Tag: v15.1.0~1535^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=8a1249626b56f345e20f1a7058aa70da9fb82576;p=ceph.git

mgr/volumes: prevent negative subvolume size

Fixes: https://tracker.ceph.com/issues/41617
Signed-off-by: Jos Collin <jcollin@redhat.com>
---

diff --git a/src/pybind/mgr/volumes/fs/subvolume.py b/src/pybind/mgr/volumes/fs/subvolume.py
index 4789bd13381..ed3314ac525 100644
--- a/src/pybind/mgr/volumes/fs/subvolume.py
+++ b/src/pybind/mgr/volumes/fs/subvolume.py
@@ -77,8 +77,10 @@ class SubVolume(object):
 
         try:
             if size is not None:
-                self.fs.setxattr(subvolpath, 'ceph.quota.max_bytes', str(size).encode('utf-8'), 0)
-
+                try:
+                    self.fs.setxattr(subvolpath, 'ceph.quota.max_bytes', str(size).encode('utf-8'), 0)
+                except cephfs.InvalidValue as e:
+                    raise VolumeException(-errno.EINVAL, "Invalid size: '{0}'".format(size))
             if pool:
                 try:
                     self.fs.setxattr(subvolpath, 'ceph.dir.layout.pool', pool.encode('utf-8'), 0)