DAOS-12751 control: Add a daos filesystem evict command.

src/client/dfuse/dfuse.h

@@ -140,6 +140,8 @@ struct dfuse_obj_hdl {
 	bool                      doh_kreaddir_started;
 	/* Set to true if readdir calls reach EOF made on this handle */
 	bool                      doh_kreaddir_finished;
+
+	bool                      doh_evict_on_close;
 };
 
 /* Readdir support.

src/client/dfuse/ops/ioctl.c

@@ -363,6 +363,11 @@ void dfuse_cb_ioctl(fuse_req_t req, fuse_ino_t ino, unsigned int cmd, void *arg,
 
 	DFUSE_TRA_DEBUG(oh, "ioctl cmd=%#x", cmd);
 
+	if (cmd == DFUSE_IOCTL_DFUSE_EVICT) {
+		oh->doh_evict_on_close = true;
+		DFUSE_REPLY_IOCTL_SIZE(oh, req, NULL, 0);
+	}
+
 	if (cmd == DFUSE_IOCTL_COUNT_QUERY) {
 		handle_cont_query_ioctl(req, in_buf, in_bufsz);
 		return;

src/client/dfuse/ops/open.c

@@ -12,7 +12,7 @@ dfuse_cb_open(fuse_req_t req, fuse_ino_t ino, struct fuse_file_info *fi)
 {
 	struct dfuse_projection_info *fs_handle = fuse_req_userdata(req);
 	struct dfuse_inode_entry     *ie;
-	d_list_t		     *rlink;
+	d_list_t                     *rlink;
 	struct dfuse_obj_hdl         *oh     = NULL;
 	struct fuse_file_info         fi_out = {0};
 	int                           rc;
@@ -153,5 +153,15 @@ dfuse_cb_release(fuse_req_t req, fuse_ino_t ino, struct fuse_file_info *fi)
 		DFUSE_REPLY_ZERO(oh, req);
 	else
 		DFUSE_REPLY_ERR_RAW(oh, req, rc);
+
+	if (oh->doh_evict_on_close) {
+		rc = fuse_lowlevel_notify_inval_entry(dfuse_info->di_session, oh->doh_ie->ie_parent,
+						      oh->doh_ie->ie_name,
+						      strnlen(oh->doh_ie->ie_name, NAME_MAX));
+
+		if (rc != 0)
+			DFUSE_TRA_ERROR(oh->doh_ie, "inval_entry() returned: %d (%s)", rc,
+					strerror(-rc));
+	}
 	dfuse_oh_free(dfuse_info, oh);
 }

src/control/cmd/daos/filesystem.go

@@ -38,6 +38,7 @@ type fsCmd struct {
 	ResetChunkSize fsResetChunkSizeCmd `command:"reset-chunk-size" description:"reset fs chunk size"`
 	ResetObjClass  fsResetOclassCmd    `command:"reset-oclass" description:"reset fs obj class"`
 	DfuseQuery     fsDfuseQueryCmd     `command:"query" description:"Query dfuse for memory usage"`
+	DfuseEvict     fsDfuseEvictCmd     `command:"evict" description:"Evict object from dfuse"`
 }
 
 type fsCopyCmd struct {
@@ -476,3 +477,28 @@ func (cmd *fsDfuseQueryCmd) Execute(_ []string) error {
 
 	return nil
 }
+
+type fsDfuseEvictCmd struct {
+	daosCmd
+
+	Args struct {
+		Path string `positional-arg-name:"path" description:"Path to evict from dfuse" required:"1"`
+	} `positional-args:"yes"`
+}
+
+func (cmd *fsDfuseEvictCmd) Execute(_ []string) error {
+	ap, deallocCmdArgs, err := allocCmdArgs(cmd.Logger)
+	if err != nil {
+		return err
+	}
+
+	ap.path = C.CString(cmd.Args.Path)
+	defer freeString(ap.path)
+	defer deallocCmdArgs()
+
+	rc := C.dfuse_evict(ap)
+	if err := daosError(rc); err != nil {
+		return errors.Wrapf(err, "failed to evict %s", cmd.Args.Path)
+	}
+	return nil
+}

src/include/dfuse_ioctl.h

@@ -1,5 +1,5 @@
 /**
- * (C) Copyright 2017-2022 Intel Corporation.
+ * (C) Copyright 2017-2023 Intel Corporation.
  *
  * SPDX-License-Identifier: BSD-2-Clause-Patent
  */
@@ -26,7 +26,8 @@
 #define DFUSE_IOCTL_REPLY_PFILE  (DFUSE_IOCTL_REPLY_BASE + 8)
 
 #define DFUSE_IOCTL_R_DFUSE_USER (DFUSE_IOCTL_REPLY_BASE + 9)
-#define DFUSE_COUNT_QUERY_CMD    (DFUSE_IOCTL_REPLY_BASE + 10)
+#define DFUSE_COUNT_QUERY_CMD    (DFUSE_IOCTL_REPLY_BASE + 11)
+#define DFUSE_IOCTL_EVICT_NR     (DFUSE_IOCTL_REPLY_BASE + 11)
 
 /** Metadada caching is enabled for this file */
 #define DFUSE_IOCTL_FLAGS_MCACHE (0x1)
@@ -87,4 +88,6 @@ struct dfuse_mem_query {
 #define DFUSE_IOCTL_COUNT_QUERY                                                                    \
 	((int)_IOWR(DFUSE_IOCTL_TYPE, DFUSE_COUNT_QUERY_CMD, struct dfuse_mem_query))
 
+#define DFUSE_IOCTL_DFUSE_EVICT ((int)_IO(DFUSE_IOCTL_TYPE, DFUSE_IOCTL_EVICT_NR))
+
 #endif /* __DFUSE_IOCTL_H__ */

src/utils/daos_hdlr.c

@@ -22,8 +22,8 @@
 #include <sys/xattr.h>
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <fcntl.h>
 #include <sys/ioctl.h>
+#include <fcntl.h>
 #include <dlfcn.h>
 #include <daos.h>
 #include <daos/common.h>
@@ -2469,3 +2469,84 @@ dfuse_count_query(struct cmd_args_s *ap)
 	close(fd);
 	return rc;
 }
+
+/* Dfuse cache evict (and helper).
+ * Open a path and make a ioctl call for dfuse to evict it.  IF the path is the root then dfuse
+ * cannot do this so perform the same over all the top-level directory entries instead.
+ */
+
+static int
+dfuse_evict_helper(int fd)
+{
+	struct dirent *ent;
+	DIR           *dir;
+	int            rc = 0;
+
+	dir = fdopendir(fd);
+	if (dir == 0) {
+		rc = errno;
+		return rc;
+	}
+
+	while ((ent = readdir(dir)) != NULL) {
+		int cfd;
+
+		printf("Processing %s\n", ent->d_name);
+
+		cfd = openat(fd, ent->d_name, O_NOFOLLOW, O_RDONLY);
+		if (cfd < 0) {
+			rc = errno;
+			goto out;
+		}
+
+		rc = ioctl(cfd, DFUSE_IOCTL_DFUSE_EVICT);
+		close(cfd);
+		if (rc < 0) {
+			rc = errno;
+			goto out;
+		}
+	}
+
+out:
+	closedir(dir);
+	return rc;
+}
+
+int
+dfuse_evict(struct cmd_args_s *ap)
+{
+	struct stat buf;
+	int         rc = -DER_SUCCESS;
+	int         fd;
+
+	fd = open(ap->path, O_NOFOLLOW, O_RDONLY);
+	if (fd < 0) {
+		rc = errno;
+		DH_PERROR_SYS(ap, rc, "Failed to open path");
+		return daos_errno2der(rc);
+	}
+
+	rc = fstat(fd, &buf);
+	if (rc < 0) {
+		rc = daos_errno2der(errno);
+		DH_PERROR_DER(ap, rc, "Failed to stat file");
+		goto close;
+	}
+
+	if (buf.st_ino == 1) {
+		rc = daos_errno2der(dfuse_evict_helper(fd));
+		DH_PERROR_DER(ap, rc, "Unable to traverse root");
+		goto close;
+	}
+
+	rc = ioctl(fd, DFUSE_IOCTL_DFUSE_EVICT);
+	if (rc < 0) {
+		rc = daos_errno2der(errno);
+		DH_PERROR_DER(ap, rc, "ioctl failed");
+		goto close;
+	}
+
+close:
+	close(fd);
+	return rc;
+}

src/utils/daos_hdlr.h

@@ -206,6 +206,10 @@ cont_check_hdlr(struct cmd_args_s *ap);
 int
 cont_clone_hdlr(struct cmd_args_s *ap);
 
+/* Dfuse operations */
+int
+dfuse_evict(struct cmd_args_s *ap);
+
 /* TODO implement the following container op functions
  * all with signatures similar to this:
  * int cont_FN_hdlr(struct cmd_args_s *ap)

utils/node_local_test.py

@@ -2496,6 +2496,23 @@ def test_xattr(self):
             for (key, value) in xattr.get_all(fd):
                 print(f'xattr is {key}:{value}')
 
+    @needs_dfuse
+    def test_evict(self):
+        """Evict a file from dfuse"""
+        new_file = join(self.dfuse.dir, 'e_file')
+        with open(new_file, 'w'):
+            pass
+
+        rc = run_daos_cmd(self.conf, ['filesystem', 'evict', new_file])
+        print(rc)
+        assert rc.returncode == 0, rc
+        time.sleep(5)
+
+        rc = run_daos_cmd(self.conf, ['filesystem', 'evict', self.dfuse.dir])
+        print(rc)
+        assert rc.returncode == 0, rc
+        time.sleep(5)
+
     @needs_dfuse
     def test_list_xattr(self):
         """Perform tests with listing extended attributes.