OS-7343 bhyve image creation blocked by tightening of quota

Reviewed by: Mike Gerdts <mike.gerdts@joyent.com> Reviewed by: Orlando Vazquez <orlando@joyent.com> Approved by: Mike Gerdts <mike.gerdts@joyent.com>
TritonDataCenter · Nov 30, 2018 · 2255127 · 2255127
1 parent a8f151d
commit 2255127
Show file tree

Hide file tree

Showing 2 changed files with 352 additions and 4 deletions.
diff --git a/src/img/lib/imgadm.js b/src/img/lib/imgadm.js
@@ -3572,6 +3572,37 @@ IMGADM.prototype.createImage = function createImage(options, callback) {
                 next();
             }
         },
+        function removeBhyveQuota(next) {
+            if (vmInfo.brand !== 'bhyve') {
+                next();
+                return;
+            }
+
+            getZfsDataset(vmInfo.zfs_filesystem, ['quota'],
+                function onDataset(err, ds) {
+                    if (err) {
+                        next(err);
+                        return;
+                    }
+
+                    zfs.set(vmInfo.zfs_filesystem, {quota: 'none'},
+                        function quotaSet(e) {
+                            if (e) {
+                                next(e);
+                                return;
+                            }
+
+                            if (ds.quota === '0') {
+                                ds.quota = 'none';
+                            }
+
+                            toCleanup.bhyveQuota = ds.quota;
+                            next();
+                        }
+                    );
+                }
+            );
+        },
         function autoprepSnapshotDatasets(next) {
             if (!prepareScript) {
                 next();
@@ -4061,6 +4092,15 @@ IMGADM.prototype.createImage = function createImage(options, callback) {
                     },
                     next);
             },
+            function cleanupBhyveQuota(next) {
+                if (!toCleanup.bhyveQuota) {
+                    next();
+                    return;
+                }
+
+                zfs.set(vmInfo.zfs_filesystem, {quota: toCleanup.bhyveQuota},
+                    next);
+            },
             function cleanupAutoprepStartVm(next) {
                 if (!toCleanup.autoprepStartVm) {
                     next();