|
 |
17b94a |
From 7c51addf7912a94320e6b148bd66f2dbf274c533 Mon Sep 17 00:00:00 2001
|
|
|
17b94a |
From: Pranith Kumar K <pkarampu@redhat.com>
|
|
|
17b94a |
Date: Mon, 11 Mar 2019 14:04:39 +0530
|
|
|
17b94a |
Subject: [PATCH 464/465] storage/posix: Remove nr_files usage
|
|
|
17b94a |
|
|
|
17b94a |
nr_files is supposed to represent the number of files opened in posix.
|
|
|
17b94a |
Present logic doesn't seem to handle anon-fds because of which the
|
|
|
17b94a |
counts would always be wrong.
|
|
|
17b94a |
|
|
|
17b94a |
I don't remember anyone using this value in debugging any problem probably
|
|
|
17b94a |
because we always have 'ls -l /proc/<pid>/fd' which not only prints the
|
|
|
17b94a |
fds that are active but also prints their paths. It also handles directories
|
|
|
17b94a |
and anon-fds which actually opened the file. So removing this code
|
|
|
17b94a |
instead of fixing the buggy logic to have the nr_files.
|
|
|
17b94a |
|
|
|
17b94a |
> fixes bz#1688106
|
|
|
17b94a |
> Change-Id: Ibf8713fdfdc1ef094e08e6818152637206a54040
|
|
|
17b94a |
> Signed-off-by: Pranith Kumar K <pkarampu@redhat.com>
|
|
|
17b94a |
> (Cherry pick from commit f5987d38f216a3142dfe45f03bf66ff4827d9b55)
|
|
|
17b94a |
> (Reviewed on upstream link https://review.gluster.org/#/c/glusterfs/+/22333/)
|
|
|
17b94a |
|
|
|
17b94a |
Change-Id: Ibf8713fdfdc1ef094e08e6818152637206a54040
|
|
|
17b94a |
BUG: 1851989
|
|
|
17b94a |
Signed-off-by: Mohit Agrawal<moagrawa@redhat.com>
|
|
|
17b94a |
Reviewed-on: https://code.engineering.redhat.com/gerrit/209468
|
|
|
17b94a |
Tested-by: RHGS Build Bot <nigelb@redhat.com>
|
|
|
17b94a |
Reviewed-by: Sunil Kumar Heggodu Gopala Acharya <sheggodu@redhat.com>
|
|
|
17b94a |
---
|
|
|
17b94a |
xlators/storage/posix/src/posix-common.c | 2 --
|
|
|
17b94a |
xlators/storage/posix/src/posix-entry-ops.c | 2 --
|
|
|
17b94a |
xlators/storage/posix/src/posix-inode-fd-ops.c | 2 --
|
|
|
17b94a |
xlators/storage/posix/src/posix.h | 1 -
|
|
|
17b94a |
4 files changed, 7 deletions(-)
|
|
|
17b94a |
|
|
|
17b94a |
diff --git a/xlators/storage/posix/src/posix-common.c b/xlators/storage/posix/src/posix-common.c
|
|
|
17b94a |
index ac53796..b317627 100644
|
|
|
17b94a |
--- a/xlators/storage/posix/src/posix-common.c
|
|
|
17b94a |
+++ b/xlators/storage/posix/src/posix-common.c
|
|
|
17b94a |
@@ -128,7 +128,6 @@ posix_priv(xlator_t *this)
|
|
|
17b94a |
gf_proc_dump_write("max_read", "%" PRId64, GF_ATOMIC_GET(priv->read_value));
|
|
|
17b94a |
gf_proc_dump_write("max_write", "%" PRId64,
|
|
|
17b94a |
GF_ATOMIC_GET(priv->write_value));
|
|
|
17b94a |
- gf_proc_dump_write("nr_files", "%" PRId64, GF_ATOMIC_GET(priv->nr_files));
|
|
|
17b94a |
|
|
|
17b94a |
return 0;
|
|
|
17b94a |
}
|
|
|
17b94a |
@@ -815,7 +814,6 @@ posix_init(xlator_t *this)
|
|
|
17b94a |
}
|
|
|
17b94a |
|
|
|
17b94a |
LOCK_INIT(&_private->lock);
|
|
|
17b94a |
- GF_ATOMIC_INIT(_private->nr_files, 0);
|
|
|
17b94a |
GF_ATOMIC_INIT(_private->read_value, 0);
|
|
|
17b94a |
GF_ATOMIC_INIT(_private->write_value, 0);
|
|
|
17b94a |
|
|
|
17b94a |
diff --git a/xlators/storage/posix/src/posix-entry-ops.c b/xlators/storage/posix/src/posix-entry-ops.c
|
|
|
17b94a |
index 65650b3..b3a5381 100644
|
|
|
17b94a |
--- a/xlators/storage/posix/src/posix-entry-ops.c
|
|
|
17b94a |
+++ b/xlators/storage/posix/src/posix-entry-ops.c
|
|
|
17b94a |
@@ -2243,8 +2243,6 @@ fill_stat:
|
|
|
17b94a |
gf_msg(this->name, GF_LOG_WARNING, 0, P_MSG_FD_PATH_SETTING_FAILED,
|
|
|
17b94a |
"failed to set the fd context path=%s fd=%p", real_path, fd);
|
|
|
17b94a |
|
|
|
17b94a |
- GF_ATOMIC_INC(priv->nr_files);
|
|
|
17b94a |
-
|
|
|
17b94a |
op_ret = 0;
|
|
|
17b94a |
|
|
|
17b94a |
out:
|
|
|
17b94a |
diff --git a/xlators/storage/posix/src/posix-inode-fd-ops.c b/xlators/storage/posix/src/posix-inode-fd-ops.c
|
|
|
17b94a |
index d135d8b..81f4a6b 100644
|
|
|
17b94a |
--- a/xlators/storage/posix/src/posix-inode-fd-ops.c
|
|
|
17b94a |
+++ b/xlators/storage/posix/src/posix-inode-fd-ops.c
|
|
|
17b94a |
@@ -1605,7 +1605,6 @@ posix_open(call_frame_t *frame, xlator_t *this, loc_t *loc, int32_t flags,
|
|
|
17b94a |
gf_msg(this->name, GF_LOG_WARNING, 0, P_MSG_FD_PATH_SETTING_FAILED,
|
|
|
17b94a |
"failed to set the fd context path=%s fd=%p", real_path, fd);
|
|
|
17b94a |
|
|
|
17b94a |
- GF_ATOMIC_INC(priv->nr_files);
|
|
|
17b94a |
op_ret = 0;
|
|
|
17b94a |
|
|
|
17b94a |
out:
|
|
|
17b94a |
@@ -2526,7 +2525,6 @@ posix_release(xlator_t *this, fd_t *fd)
|
|
|
17b94a |
if (!priv)
|
|
|
17b94a |
goto out;
|
|
|
17b94a |
|
|
|
17b94a |
- GF_ATOMIC_DEC(priv->nr_files);
|
|
|
17b94a |
out:
|
|
|
17b94a |
return 0;
|
|
|
17b94a |
}
|
|
|
17b94a |
diff --git a/xlators/storage/posix/src/posix.h b/xlators/storage/posix/src/posix.h
|
|
|
17b94a |
index 61495a7..124dbb4 100644
|
|
|
17b94a |
--- a/xlators/storage/posix/src/posix.h
|
|
|
17b94a |
+++ b/xlators/storage/posix/src/posix.h
|
|
|
17b94a |
@@ -154,7 +154,6 @@ struct posix_private {
|
|
|
17b94a |
|
|
|
17b94a |
gf_atomic_t read_value; /* Total read, from init */
|
|
|
17b94a |
gf_atomic_t write_value; /* Total write, from init */
|
|
|
17b94a |
- gf_atomic_t nr_files;
|
|
|
17b94a |
/*
|
|
|
17b94a |
In some cases, two exported volumes may reside on the same
|
|
|
17b94a |
partition on the server. Sending statvfs info for both
|
|
|
17b94a |
--
|
|
|
17b94a |
1.8.3.1
|
|
|
17b94a |
|