summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--xlators/features/changelog/src/changelog-helpers.h13
-rw-r--r--xlators/features/changelog/src/changelog.c12
2 files changed, 25 insertions, 0 deletions
diff --git a/xlators/features/changelog/src/changelog-helpers.h b/xlators/features/changelog/src/changelog-helpers.h
index 9bd4a3f..d8f8046 100644
--- a/xlators/features/changelog/src/changelog-helpers.h
+++ b/xlators/features/changelog/src/changelog-helpers.h
@@ -539,6 +539,19 @@ int __chlog_barrier_enable (xlator_t *this, changelog_priv_t *priv);
goto label; \
} while (0)
+/* If it is a METADATA entry and fop num being GF_FOP_NULL, don't
+ * log in the changelog as it is of no use. And also if it is
+ * logged, since slicing version checking is done for metadata
+ * entries, the subsequent entries with valid fop num which falls
+ * to same changelog will be missed. Hence check for boundary
+ * condition.
+ */
+#define CHANGELOG_OP_BOUNDARY_CHECK(frame, label) do { \
+ if (frame->root->op <= GF_FOP_NULL || \
+ frame->root->op >= GF_FOP_MAXVALUE) \
+ goto label; \
+ } while (0)
+
/**
* ignore internal fops for all clients except AFR self-heal daemon
*/
diff --git a/xlators/features/changelog/src/changelog.c b/xlators/features/changelog/src/changelog.c
index 12b39f7..d2e30f7 100644
--- a/xlators/features/changelog/src/changelog.c
+++ b/xlators/features/changelog/src/changelog.c
@@ -1091,6 +1091,8 @@ changelog_fsetattr (call_frame_t *frame,
priv = this->private;
CHANGELOG_NOT_ACTIVE_THEN_GOTO (frame, priv, wind);
+ CHANGELOG_OP_BOUNDARY_CHECK (frame, wind);
+
CHANGELOG_INIT (this, frame->local,
fd->inode, fd->inode->gfid, 1);
if (!frame->local)
@@ -1150,6 +1152,8 @@ changelog_setattr (call_frame_t *frame,
priv = this->private;
CHANGELOG_NOT_ACTIVE_THEN_GOTO (frame, priv, wind);
+ CHANGELOG_OP_BOUNDARY_CHECK (frame, wind);
+
CHANGELOG_INIT (this, frame->local,
loc->inode, loc->inode->gfid, 1);
if (!frame->local)
@@ -1206,6 +1210,8 @@ changelog_fremovexattr (call_frame_t *frame, xlator_t *this,
priv = this->private;
CHANGELOG_NOT_ACTIVE_THEN_GOTO (frame, priv, wind);
+ CHANGELOG_OP_BOUNDARY_CHECK (frame, wind);
+
CHANGELOG_INIT (this, frame->local,
fd->inode, fd->inode->gfid, 1);
@@ -1258,6 +1264,8 @@ changelog_removexattr (call_frame_t *frame, xlator_t *this,
priv = this->private;
CHANGELOG_NOT_ACTIVE_THEN_GOTO (frame, priv, wind);
+ CHANGELOG_OP_BOUNDARY_CHECK (frame, wind);
+
CHANGELOG_INIT (this, frame->local,
loc->inode, loc->inode->gfid, 1);
@@ -1313,6 +1321,8 @@ changelog_setxattr (call_frame_t *frame,
priv = this->private;
CHANGELOG_NOT_ACTIVE_THEN_GOTO (frame, priv, wind);
+ CHANGELOG_OP_BOUNDARY_CHECK (frame, wind);
+
CHANGELOG_INIT (this, frame->local,
loc->inode, loc->inode->gfid, 1);
@@ -1366,6 +1376,8 @@ changelog_fsetxattr (call_frame_t *frame,
priv = this->private;
CHANGELOG_NOT_ACTIVE_THEN_GOTO (frame, priv, wind);
+ CHANGELOG_OP_BOUNDARY_CHECK (frame, wind);
+
CHANGELOG_INIT (this, frame->local,
fd->inode, fd->inode->gfid, 1);