summaryrefslogtreecommitdiffstats
path: root/xlators/cluster
diff options
context:
space:
mode:
Diffstat (limited to 'xlators/cluster')
-rw-r--r--xlators/cluster/afr/src/afr-inode-read.c45
-rw-r--r--xlators/cluster/dht/src/dht-common.c115
2 files changed, 108 insertions, 52 deletions
diff --git a/xlators/cluster/afr/src/afr-inode-read.c b/xlators/cluster/afr/src/afr-inode-read.c
index 25d576d0261..77acf0b25b9 100644
--- a/xlators/cluster/afr/src/afr-inode-read.c
+++ b/xlators/cluster/afr/src/afr-inode-read.c
@@ -35,6 +35,7 @@
#include "common-utils.h"
#include "compat-errno.h"
#include "compat.h"
+#include "quota-common-utils.h"
#include "afr-transaction.h"
@@ -50,15 +51,16 @@
int
afr_handle_quota_size (call_frame_t *frame, xlator_t *this)
{
- unsigned char *readable = NULL;
- afr_local_t *local = NULL;
- afr_private_t *priv = NULL;
+ unsigned char *readable = NULL;
+ afr_local_t *local = NULL;
+ afr_private_t *priv = NULL;
struct afr_reply *replies = NULL;
- int i = 0;
- uint64_t size = 0;
- uint64_t max_size = 0;
- int readable_cnt = 0;
- int read_subvol = -1;
+ int i = 0;
+ int ret = 0;
+ quota_meta_t size = {0, };
+ quota_meta_t max_size = {0, };
+ int readable_cnt = 0;
+ int read_subvol = -1;
local = frame->local;
priv = this->private;
@@ -77,22 +79,29 @@ afr_handle_quota_size (call_frame_t *frame, xlator_t *this)
continue;
if (!replies[i].xdata)
continue;
- if (dict_get_uint64 (replies[i].xdata, QUOTA_SIZE_KEY, &size))
+ ret = quota_dict_get_meta (replies[i].xdata, QUOTA_SIZE_KEY,
+ &size);
+ if (ret == -1)
continue;
- size = ntoh64 (size);
if (read_subvol == -1)
read_subvol = i;
- if (size > max_size) {
+ if (size.size > max_size.size ||
+ (size.file_count + size.dir_count) >
+ (max_size.file_count + max_size.dir_count))
read_subvol = i;
- max_size = size;
- }
+
+ if (size.size > max_size.size)
+ max_size.size = size.size;
+ if (size.file_count > max_size.file_count)
+ max_size.file_count = size.file_count;
+ if (size.dir_count > max_size.dir_count)
+ max_size.dir_count = size.dir_count;
}
- if (!max_size)
+ if (max_size.size == 0 && max_size.file_count == 0 &&
+ max_size.dir_count == 0)
return read_subvol;
- max_size = hton64 (max_size);
-
for (i = 0; i < priv->child_count; i++) {
if (!replies[i].valid || replies[i].op_ret == -1)
continue;
@@ -100,8 +109,8 @@ afr_handle_quota_size (call_frame_t *frame, xlator_t *this)
continue;
if (!replies[i].xdata)
continue;
- if (dict_set_uint64 (replies[i].xdata, QUOTA_SIZE_KEY, max_size))
- continue;
+ quota_dict_set_meta (replies[i].xdata, QUOTA_SIZE_KEY,
+ &max_size, IA_IFDIR);
}
return read_subvol;
diff --git a/xlators/cluster/dht/src/dht-common.c b/xlators/cluster/dht/src/dht-common.c
index 729ab30e672..9fda4aa07d6 100644
--- a/xlators/cluster/dht/src/dht-common.c
+++ b/xlators/cluster/dht/src/dht-common.c
@@ -23,6 +23,7 @@
#include "defaults.h"
#include "byte-order.h"
#include "glusterfs-acl.h"
+#include "quota-common-utils.h"
#include <sys/time.h>
#include <libgen.h>
@@ -31,47 +32,90 @@
int dht_link2 (xlator_t *this, call_frame_t *frame, int op_ret);
int
-dht_aggregate (dict_t *this, char *key, data_t *value, void *data)
+dht_aggregate_quota_xattr (dict_t *dst, char *key, data_t *value)
{
- dict_t *dst = NULL;
- int64_t *ptr = 0, *size = NULL;
- int32_t ret = -1;
- data_t *dict_data = NULL;
-
- dst = data;
+ int ret = -1;
+ quota_meta_t *meta_dst = NULL;
+ quota_meta_t *meta_src = NULL;
+ int64_t *size = NULL;
+ int64_t dst_dir_count = 0;
+ int64_t src_dir_count = 0;
+
+ if (value == NULL) {
+ gf_log ("dht", GF_LOG_WARNING, "data value is NULL");
+ ret = -1;
+ goto out;
+ }
- if (strcmp (key, GF_XATTR_QUOTA_SIZE_KEY) == 0) {
- ret = dict_get_bin (dst, key, (void **)&size);
+ ret = dict_get_bin (dst, key, (void **)&meta_dst);
+ if (ret < 0) {
+ meta_dst = GF_CALLOC (1, sizeof (quota_meta_t),
+ gf_common_quota_meta_t);
+ if (meta_dst == NULL) {
+ gf_msg ("dht", GF_LOG_WARNING, 0, DHT_MSG_NO_MEMORY,
+ "Memory allocation failed");
+ ret = -1;
+ goto out;
+ }
+ ret = dict_set_bin (dst, key, meta_dst,
+ sizeof (quota_meta_t));
if (ret < 0) {
- size = GF_CALLOC (1, sizeof (int64_t),
- gf_common_mt_char);
- if (size == NULL) {
- gf_msg ("dht", GF_LOG_WARNING, 0,
- DHT_MSG_NO_MEMORY,
- "Memory allocation failed");
- return -1;
- }
- ret = dict_set_bin (dst, key, size, sizeof (int64_t));
- if (ret < 0) {
- gf_log ("dht", GF_LOG_WARNING,
- "dht aggregate dict set failed");
- GF_FREE (size);
- return -1;
- }
+ gf_log ("dht", GF_LOG_WARNING,
+ "dht aggregate dict set failed");
+ GF_FREE (meta_dst);
+ ret = -1;
+ goto out;
}
+ }
+
+ if (value->len > sizeof (int64_t)) {
+ meta_src = data_to_bin (value);
+
+ meta_dst->size = hton64 (ntoh64 (meta_dst->size) +
+ ntoh64 (meta_src->size));
+ meta_dst->file_count = hton64 (ntoh64 (meta_dst->file_count) +
+ ntoh64 (meta_src->file_count));
- ptr = data_to_bin (value);
- if (ptr == NULL) {
- gf_log ("dht", GF_LOG_WARNING, "data to bin failed");
- return -1;
+ if (value->len > (2 * sizeof (int64_t))) {
+ dst_dir_count = ntoh64 (meta_dst->dir_count);
+ src_dir_count = ntoh64 (meta_src->dir_count);
+
+ if (src_dir_count > dst_dir_count)
+ meta_dst->dir_count = meta_src->dir_count;
+ } else {
+ meta_dst->dir_count = 0;
}
+ } else {
+ size = data_to_bin (value);
+ meta_dst->size = hton64 (ntoh64 (meta_dst->size) +
+ ntoh64 (*size));
+ }
+
+ ret = 0;
+out:
+ return ret;
+}
- *size = hton64 (ntoh64 (*size) + ntoh64 (*ptr));
+int
+dht_aggregate (dict_t *this, char *key, data_t *value, void *data)
+{
+ dict_t *dst = NULL;
+ int32_t ret = -1;
+ data_t *dict_data = NULL;
+
+ dst = data;
+ if (strcmp (key, QUOTA_SIZE_KEY) == 0) {
+ ret = dht_aggregate_quota_xattr (dst, key, value);
+ if (ret) {
+ gf_log ("dht", GF_LOG_WARNING, "Failed to "
+ "aggregate qutoa xattr");
+ goto out;
+ }
} else if (fnmatch (GF_XATTR_STIME_PATTERN, key, FNM_NOESCAPE) == 0) {
ret = gf_get_min_stime (THIS, dst, key, value);
if (ret < 0)
- return ret;
+ goto out;
} else {
/* compare user xattrs only */
if (!strncmp (key, "user.", strlen ("user."))) {
@@ -85,14 +129,17 @@ dht_aggregate (dict_t *this, char *key, data_t *value, void *data)
}
}
ret = dict_set (dst, key, value);
- if (ret)
+ if (ret) {
gf_msg ("dht", GF_LOG_WARNING, 0,
DHT_MSG_DICT_SET_FAILED,
"Failed to set dictionary value: key = %s",
key);
+ }
}
- return 0;
+ ret = 0;
+out:
+ return ret;
}
@@ -255,7 +302,6 @@ selfheal:
}
-
int
dht_discover_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
int op_ret, int op_errno,
@@ -2896,7 +2942,8 @@ dht_getxattr (call_frame_t *frame, xlator_t *this,
return 0;
}
- if (key && !strcmp (GF_XATTR_QUOTA_LIMIT_LIST, key)) {
+ if (key && (!strcmp (GF_XATTR_QUOTA_LIMIT_LIST, key) ||
+ !strcmp (GF_XATTR_QUOTA_LIMIT_LIST_OBJECT, key))) {
/* quota hardlimit and aggregated size of a directory is stored
* in inode contexts of each brick. Hence its good enough that
* we send getxattr for this key to any brick.
generated by cgit (git 2.34.1) at 2024-05-21 18:30:48 +0000