Permalink
Browse files

OS-1504 In 7.0, the cores dataset quota is a no-op

  • Loading branch information...
1 parent da9133a commit 978f474fbff0a83bd6315be6c7e53556bddd8db2 @jjelinek jjelinek committed Aug 28, 2012
View
4 overlay/generic/usr/lib/brand/joyent-minimal/common.ksh
@@ -31,8 +31,8 @@ final_setup()
# samples from JPC.
rm -rf $ZONEPATH/cores
CORE_QUOTA=102400
- zfs create -o quota=${CORE_QUOTA}m -o compression=gzip \
- $PDS_NAME/$bname/cores
+ zfs create -o quota=${CORE_QUOTA}m -o mountpoint=/zones/$bname/cores \
+ zones/cores/$bname
chmod 700 $ZONEPATH
View
2 overlay/generic/usr/lib/brand/joyent-minimal/juninstall
@@ -60,7 +60,7 @@ fi
ORIGIN=`zfs get -H -ovalue origin $PDS_NAME/$bname`
-zfs destroy -rF $PDS_NAME/$bname/cores
+zfs destroy -rF zones/cores/$bname
zfs destroy -rF $PDS_NAME/$bname
(( $? != 0 )) && (echo "processes in zone: " && fuser $ZONEPATH)
View
4 overlay/generic/usr/lib/brand/joyent/common.ksh
@@ -31,8 +31,8 @@ final_setup()
# samples from JPC.
rm -rf $ZONEPATH/cores
CORE_QUOTA=102400
- zfs create -o quota=${CORE_QUOTA}m -o compression=gzip \
- $PDS_NAME/$bname/cores
+ zfs create -o quota=${CORE_QUOTA}m -o mountpoint=/zones/$bname/cores \
+ zones/cores/$bname
chmod 700 $ZONEPATH
View
2 overlay/generic/usr/lib/brand/joyent/juninstall
@@ -60,7 +60,7 @@ fi
ORIGIN=`zfs get -H -ovalue origin $PDS_NAME/$bname`
-zfs destroy -rF $PDS_NAME/$bname/cores
+zfs destroy -rF zones/cores/$bname
zfs destroy -rF $PDS_NAME/$bname
(( $? != 0 )) && (echo "processes in zone: " && fuser $ZONEPATH)
View
4 overlay/generic/usr/lib/brand/kvm/common.ksh
@@ -43,6 +43,6 @@ final_setup()
# such that it will protect the system from a single run-away, but
# still allow us to get most cores.
rm -rf $ZONEPATH/cores
- zfs create -o quota=${CORE_QUOTA}m -o compression=gzip \
- $PDS_NAME/$bname/cores
+ zfs create -o quota=${CORE_QUOTA}m -o mountpoint=/zones/$bname/cores \
+ zones/cores/$bname
}
View
2 overlay/generic/usr/lib/brand/kvm/kuninstall
@@ -68,7 +68,7 @@ done
ORIGIN=`zfs get -H -ovalue origin $PDS_NAME/$bname`
-zfs destroy -rF $PDS_NAME/$bname/cores
+zfs destroy -rF zones/cores/$bname
zfs destroy -rF $PDS_NAME/$bname
[ "$ORIGIN" != "-" ] && zfs destroy -F $ORIGIN

0 comments on commit 978f474

Please sign in to comment.