Revert "LU-2600 osd-zfs: batched object accounting"

[fs/lustre-release.git] / lustre / osd-zfs / osd_object.c

diff --git a/lustre/osd-zfs/osd_object.c b/lustre/osd-zfs/osd_object.c
index fa7d1fc..151ad39 100644 (file)
--- a/lustre/osd-zfs/osd_object.c
+++ b/lustre/osd-zfs/osd_object.c
@@ -632,9 +632,21 @@ static int osd_object_destroy(const struct lu_env *env,
                GOTO(out, rc);
        }
 
-       /* do object accounting */
-       osd_zfs_acct_uid(env, osd, obj->oo_attr.la_uid, -1, oh);
-       osd_zfs_acct_gid(env, osd, obj->oo_attr.la_gid, -1, oh);
+       /* Remove object from inode accounting. It is not fatal for the destroy
+        * operation if something goes wrong while updating accounting, but we
+        * still log an error message to notify the administrator */
+       rc = -zap_increment_int(osd->od_objset.os, osd->od_iusr_oid,
+                       obj->oo_attr.la_uid, -1, oh->ot_tx);
+       if (rc)
+               CERROR("%s: failed to remove "DFID" from accounting ZAP for usr"
+                       " %d: rc = %d\n", osd->od_svname, PFID(fid),
+                       obj->oo_attr.la_uid, rc);
+       rc = -zap_increment_int(osd->od_objset.os, osd->od_igrp_oid,
+                               obj->oo_attr.la_gid, -1, oh->ot_tx);
+       if (rc)
+               CERROR("%s: failed to remove "DFID" from accounting ZAP for grp"
+                       " %d: rc = %d\n", osd->od_svname, PFID(fid),
+                       obj->oo_attr.la_gid, rc);
 
        /* kill object */
        rc = __osd_object_destroy(env, obj, oh->ot_tx, osd_obj_tag);
@@ -944,14 +956,34 @@ static int osd_attr_set(const struct lu_env *env, struct dt_object *dt,
 
        /* do both accounting updates outside oo_attr_lock below */
        if ((la->la_valid & LA_UID) && (la->la_uid != obj->oo_attr.la_uid)) {
-               /* do object accounting */
-               osd_zfs_acct_uid(env, osd, la->la_uid, 1, oh);
-               osd_zfs_acct_uid(env, osd, obj->oo_attr.la_uid, -1, oh);
+               /* Update user accounting. Failure isn't fatal, but we still
+                * log an error message */
+               rc = -zap_increment_int(osd->od_objset.os, osd->od_iusr_oid,
+                                       la->la_uid, 1, oh->ot_tx);
+               if (rc)
+                       CERROR("%s: failed to update accounting ZAP for user "
+                               "%d (%d)\n", osd->od_svname, la->la_uid, rc);
+               rc = -zap_increment_int(osd->od_objset.os, osd->od_iusr_oid,
+                                       obj->oo_attr.la_uid, -1, oh->ot_tx);
+               if (rc)
+                       CERROR("%s: failed to update accounting ZAP for user "
+                               "%d (%d)\n", osd->od_svname,
+                               obj->oo_attr.la_uid, rc);
        }
        if ((la->la_valid & LA_GID) && (la->la_gid != obj->oo_attr.la_gid)) {
-               /* do object accounting */
-               osd_zfs_acct_gid(env, osd, la->la_gid, 1, oh);
-               osd_zfs_acct_gid(env, osd, obj->oo_attr.la_gid, -1, oh);
+               /* Update group accounting. Failure isn't fatal, but we still
+                * log an error message */
+               rc = -zap_increment_int(osd->od_objset.os, osd->od_igrp_oid,
+                                       la->la_gid, 1, oh->ot_tx);
+               if (rc)
+                       CERROR("%s: failed to update accounting ZAP for user "
+                               "%d (%d)\n", osd->od_svname, la->la_gid, rc);
+               rc = -zap_increment_int(osd->od_objset.os, osd->od_igrp_oid,
+                                       obj->oo_attr.la_gid, -1, oh->ot_tx);
+               if (rc)
+                       CERROR("%s: failed to update accounting ZAP for user "
+                               "%d (%d)\n", osd->od_svname,
+                               obj->oo_attr.la_gid, rc);
        }
 
        write_lock(&obj->oo_attr_lock);
@@ -1473,9 +1505,18 @@ static int osd_object_create(const struct lu_env *env, struct dt_object *dt,
 
        /* Add new object to inode accounting.
         * Errors are not considered as fatal */
-       /* XXX: UID/GID must be defined otherwise we can break accounting */
-       osd_zfs_acct_uid(env, osd, attr->la_uid, 1, oh);
-       osd_zfs_acct_gid(env, osd, attr->la_gid, 1, oh);
+       rc = -zap_increment_int(osd->od_objset.os, osd->od_iusr_oid,
+                               (attr->la_valid & LA_UID) ? attr->la_uid : 0, 1,
+                               oh->ot_tx);
+       if (rc)
+               CERROR("%s: failed to add "DFID" to accounting ZAP for usr %d "
+                       "(%d)\n", osd->od_svname, PFID(fid), attr->la_uid, rc);
+       rc = -zap_increment_int(osd->od_objset.os, osd->od_igrp_oid,
+                               (attr->la_valid & LA_GID) ? attr->la_gid : 0, 1,
+                               oh->ot_tx);
+       if (rc)
+               CERROR("%s: failed to add "DFID" to accounting ZAP for grp %d "
+                       "(%d)\n", osd->od_svname, PFID(fid), attr->la_gid, rc);
 
        /* configure new osd object */
        obj->oo_db = db;