Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 13 Mar 2019 13:41:05 +0000 (UTC)
From:      Alan Somers <asomers@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject:   svn commit: r345086 - projects/fuse2/tests/sys/fs/fuse
Message-ID:  <201903131341.x2DDf5aB013942@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: asomers
Date: Wed Mar 13 13:41:05 2019
New Revision: 345086
URL: https://svnweb.freebsd.org/changeset/base/345086

Log:
  fues(4): add tests for FUSE_RELEASEDIR
  
  Sponsored by:	The FreeBSD Foundation

Added:
  projects/fuse2/tests/sys/fs/fuse/releasedir.cc   (contents, props changed)
Modified:
  projects/fuse2/tests/sys/fs/fuse/Makefile
  projects/fuse2/tests/sys/fs/fuse/mockfs.hh

Modified: projects/fuse2/tests/sys/fs/fuse/Makefile
==============================================================================
--- projects/fuse2/tests/sys/fs/fuse/Makefile	Wed Mar 13 09:48:33 2019	(r345085)
+++ projects/fuse2/tests/sys/fs/fuse/Makefile	Wed Mar 13 13:41:05 2019	(r345086)
@@ -20,6 +20,7 @@ ATF_TESTS_CXX+=	read
 ATF_TESTS_CXX+=	readdir
 ATF_TESTS_CXX+=	readlink
 ATF_TESTS_CXX+=	release
+ATF_TESTS_CXX+=	releasedir
 ATF_TESTS_CXX+=	rename
 ATF_TESTS_CXX+=	rmdir
 ATF_TESTS_CXX+=	setattr
@@ -107,6 +108,11 @@ SRCS.release+=	getmntopts.c
 SRCS.release+=	mockfs.cc
 SRCS.release+=	release.cc
 SRCS.release+=	utils.cc
+
+SRCS.releasedir+=	getmntopts.c
+SRCS.releasedir+=	mockfs.cc
+SRCS.releasedir+=	releasedir.cc
+SRCS.releasedir+=	utils.cc
 
 SRCS.rename+=	getmntopts.c
 SRCS.rename+=	mockfs.cc

Modified: projects/fuse2/tests/sys/fs/fuse/mockfs.hh
==============================================================================
--- projects/fuse2/tests/sys/fs/fuse/mockfs.hh	Wed Mar 13 09:48:33 2019	(r345085)
+++ projects/fuse2/tests/sys/fs/fuse/mockfs.hh	Wed Mar 13 13:41:05 2019	(r345086)
@@ -88,6 +88,7 @@ union fuse_payloads_in {
 	fuse_read_in	read;
 	fuse_read_in	readdir;
 	fuse_release_in	release;
+	fuse_release_in	releasedir;
 	fuse_rename_in	rename;
 	char		rmdir[0];
 	fuse_setattr_in	setattr;

Added: projects/fuse2/tests/sys/fs/fuse/releasedir.cc
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/fuse2/tests/sys/fs/fuse/releasedir.cc	Wed Mar 13 13:41:05 2019	(r345086)
@@ -0,0 +1,144 @@
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
+ * Copyright (c) 2019 The FreeBSD Foundation
+ *
+ * This software was developed by BFF Storage Systems, LLC under sponsorship
+ * from the FreeBSD Foundation.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+extern "C" {
+#include <dirent.h>
+}
+
+#include "mockfs.hh"
+#include "utils.hh"
+
+using namespace testing;
+
+class ReleaseDir: public FuseTest {
+
+const static uint64_t FH = 0xdeadbeef1a7ebabe;
+
+public:
+void expect_lookup(const char *relpath, uint64_t ino)
+{
+	EXPECT_LOOKUP(1, relpath).WillRepeatedly(Invoke([=](auto in, auto out) {
+		out->header.unique = in->header.unique;
+		SET_OUT_HEADER_LEN(out, entry);
+		out->body.entry.attr.mode = S_IFDIR | 0755;
+		out->body.entry.nodeid = ino;
+		out->body.entry.attr_valid = UINT64_MAX;
+	}));
+}
+
+void expect_opendir(uint64_t ino)
+{
+	EXPECT_CALL(*m_mock, process(
+		ResultOf([](auto in) {
+			return (in->header.opcode == FUSE_STATFS);
+		}, Eq(true)),
+		_)
+	).WillRepeatedly(Invoke([=](auto in, auto out) {
+		out->header.unique = in->header.unique;
+		SET_OUT_HEADER_LEN(out, statfs);
+	}));
+
+	EXPECT_CALL(*m_mock, process(
+		ResultOf([=](auto in) {
+			return (in->header.opcode == FUSE_OPENDIR &&
+				in->header.nodeid == ino);
+		}, Eq(true)),
+		_)
+	).WillOnce(Invoke([=](auto in, auto out) {
+		out->header.unique = in->header.unique;
+		out->header.len = sizeof(out->header);
+		SET_OUT_HEADER_LEN(out, open);
+		out->body.open.fh = FH;
+	}));
+}
+
+void expect_releasedir(uint64_t ino, ProcessMockerT r)
+{
+	EXPECT_CALL(*m_mock, process(
+		ResultOf([=](auto in) {
+			return (in->header.opcode == FUSE_RELEASEDIR &&
+				in->header.nodeid == ino &&
+				in->body.release.fh == FH);
+		}, Eq(true)),
+		_)
+	).WillOnce(Invoke(r));
+}
+};
+
+/* If a file descriptor is duplicated, only the last close causes RELEASE */
+TEST_F(ReleaseDir, dup)
+{
+	const char FULLPATH[] = "mountpoint/some_file.txt";
+	const char RELPATH[] = "some_file.txt";
+	uint64_t ino = 42;
+	DIR *dir, *dir2;
+
+	expect_lookup(RELPATH, ino);
+	expect_opendir(ino);
+	EXPECT_CALL(*m_mock, process(
+		ResultOf([=](auto in) {
+			return (in->header.opcode == FUSE_READDIR &&
+				in->header.nodeid == ino &&
+				in->body.readdir.offset == 0);
+		}, Eq(true)),
+		_)
+	).WillOnce(Invoke([=](auto in, auto out) {
+		out->header.unique = in->header.unique;
+		out->header.error = 0;
+		out->header.len = sizeof(out->header);
+	}));
+	expect_releasedir(ino, ReturnErrno(0));
+	
+	dir = opendir(FULLPATH);
+	ASSERT_NE(NULL, dir) << strerror(errno);
+
+	dir2 = fdopendir(dup(dirfd(dir)));
+	ASSERT_NE(NULL, dir2) << strerror(errno);
+
+	ASSERT_EQ(0, closedir(dir)) << strerror(errno);
+	ASSERT_EQ(0, closedir(dir2)) << strerror(errno);
+}
+
+TEST_F(ReleaseDir, ok)
+{
+	const char FULLPATH[] = "mountpoint/some_dir";
+	const char RELPATH[] = "some_dir";
+	uint64_t ino = 42;
+	DIR *dir;
+
+	expect_lookup(RELPATH, ino);
+	expect_opendir(ino);
+	expect_releasedir(ino, ReturnErrno(0));
+	
+	dir = opendir(FULLPATH);
+	ASSERT_NE(NULL, dir) << strerror(errno);
+
+	ASSERT_EQ(0, closedir(dir)) << strerror(errno);
+}



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201903131341.x2DDf5aB013942>