Skip to content

Commit 9c5167d

Browse files
Nasf-Fanbehlendorf
authored andcommitted
Project Quota on ZFS
Project quota is a new ZFS system space/object usage accounting and enforcement mechanism. Similar as user/group quota, project quota is another dimension of system quota. It bases on the new object attribute - project ID. Project ID is a numerical value to indicate to which project an object belongs. An object only can belong to one project though you (the object owner or privileged user) can change the object project ID via 'chattr -p' or 'zfs project [-s] -p' explicitly. The object also can inherit the project ID from its parent when created if the parent has the project inherit flag (that can be set via 'chattr +P' or 'zfs project -s [-p]'). By accounting the spaces/objects belong to the same project, we can know how many spaces/objects used by the project. And if we set the upper limit then we can control the spaces/objects that are consumed by such project. It is useful when multiple groups and users cooperate for the same project, or a user/group needs to participate in multiple projects. Support the following commands and functionalities: zfs set projectquota@project zfs set projectobjquota@project zfs get projectquota@project zfs get projectobjquota@project zfs get projectused@project zfs get projectobjused@project zfs projectspace zfs allow projectquota zfs allow projectobjquota zfs allow projectused zfs allow projectobjused zfs unallow projectquota zfs unallow projectobjquota zfs unallow projectused zfs unallow projectobjused chattr +/-P chattr -p project_id lsattr -p This patch also supports tree quota based on the project quota via "zfs project" commands set as following: zfs project [-d|-r] <file|directory ...> zfs project -C [-k] [-r] <file|directory ...> zfs project -c [-0] [-d|-r] [-p id] <file|directory ...> zfs project [-p id] [-r] [-s] <file|directory ...> For "df [-i] $DIR" command, if we set INHERIT (project ID) flag on the $DIR, then the proejct [obj]quota and [obj]used values for the $DIR's project ID will be shown as the total/free (avail) resource. Keep the same behavior as EXT4/XFS does. Reviewed-by: Andreas Dilger <[email protected]> Reviewed-by Ned Bass <[email protected]> Reviewed-by: Matthew Ahrens <[email protected]> Reviewed-by: Brian Behlendorf <[email protected]> Signed-off-by: Fan Yong <[email protected]> TEST_ZIMPORT_POOLS="zol-0.6.1 zol-0.6.2 master" Change-Id: Ib4f0544602e03fb61fd46a849d7ba51a6005693c Closes openzfs#6290
1 parent c03f047 commit 9c5167d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

82 files changed

+4519
-280
lines changed

cmd/zdb/zdb.c

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1880,6 +1880,13 @@ dump_znode(objset_t *os, uint64_t object, void *data, size_t size)
18801880
(void) printf("\tparent %llu\n", (u_longlong_t)parent);
18811881
(void) printf("\tlinks %llu\n", (u_longlong_t)links);
18821882
(void) printf("\tpflags %llx\n", (u_longlong_t)pflags);
1883+
if (dmu_objset_projectquota_enabled(os) && (pflags & ZFS_PROJID)) {
1884+
uint64_t projid;
1885+
1886+
if (sa_lookup(hdl, sa_attr_table[ZPL_PROJID], &projid,
1887+
sizeof (uint64_t)) == 0)
1888+
(void) printf("\tprojid %llu\n", (u_longlong_t)projid);
1889+
}
18831890
if (sa_lookup(hdl, sa_attr_table[ZPL_XATTR], &xattr,
18841891
sizeof (uint64_t)) == 0)
18851892
(void) printf("\txattr %llu\n", (u_longlong_t)xattr);
@@ -1942,8 +1949,8 @@ static object_viewer_t *object_viewer[DMU_OT_NUMTYPES + 1] = {
19421949
dump_packed_nvlist, /* FUID nvlist size */
19431950
dump_zap, /* DSL dataset next clones */
19441951
dump_zap, /* DSL scrub queue */
1945-
dump_zap, /* ZFS user/group used */
1946-
dump_zap, /* ZFS user/group quota */
1952+
dump_zap, /* ZFS user/group/project used */
1953+
dump_zap, /* ZFS user/group/project quota */
19471954
dump_zap, /* snapshot refcount tags */
19481955
dump_ddt_zap, /* DDT ZAP object */
19491956
dump_zap, /* DDT statistics */
@@ -2218,6 +2225,11 @@ dump_dir(objset_t *os)
22182225
NULL);
22192226
}
22202227

2228+
if (DMU_PROJECTUSED_DNODE(os) != NULL &&
2229+
DMU_PROJECTUSED_DNODE(os)->dn_type != 0)
2230+
dump_object(os, DMU_PROJECTUSED_OBJECT, verbosity,
2231+
&print_header, NULL);
2232+
22212233
object = 0;
22222234
while ((error = dmu_object_next(os, &object, B_FALSE, 0)) == 0) {
22232235
dump_object(os, object, verbosity, &print_header, &dnode_slots);

cmd/zfs/Makefile.am

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,9 @@ zfs_SOURCES = \
1010
zfs_iter.c \
1111
zfs_iter.h \
1212
zfs_main.c \
13-
zfs_util.h
13+
zfs_util.h \
14+
zfs_project.c \
15+
zfs_projectutil.h
1416

1517
zfs_LDADD = \
1618
$(top_builddir)/lib/libnvpair/libnvpair.la \

0 commit comments

Comments
 (0)