Merge pull request #112 from ellert/fixes

Author: bbockelm

CMakeLists.txt

@@ -151,7 +151,7 @@ target_link_libraries(XrdOssGlobus XrdOssGlobusObj)
 #######################
 add_library( XrdOssPoscObj OBJECT src/Posc.cc )
 set_target_properties( XrdOssPoscObj PROPERTIES POSITION_INDEPENDENT_CODE ON )
-target_link_libraries( XrdOssPoscObj XRootD::XrdServer XRootD::XrdUtils )
+target_link_libraries( XrdOssPoscObj XRootD::XrdServer XRootD::XrdUtils Threads::Threads std::atomic )
 
 add_library( XrdOssPosc MODULE "$<TARGET_OBJECTS:XrdOssPoscObj>" )
 target_link_libraries( XrdOssPosc XrdOssPoscObj )
@@ -212,7 +212,7 @@ if( ENABLE_TESTS )
     if( go_install_result EQUAL 0 )
       find_program(GoWrk go-wrk HINTS "$ENV{HOME}/go/bin")
     else()
-      message(ERROR "Failed to install the go-wrk binary" )
+      message( WARNING "Failed to install the go-wrk binary" )
     endif()
   endif()
 

src/HTTPFile.cc

@@ -62,7 +62,7 @@ int HTTPFile::Open(const char *path, int Oflag, mode_t Mode, XrdOucEnv &env) {
 		m_log.Log(LogMask::Info, "HTTPFile::Open",
 				  "File opened for append:", path);
 	}
-	if (Oflag & (O_RDWR | O_WRONLY)) {
+	if ((Oflag & O_ACCMODE) != O_RDONLY) {
 		m_write = true;
 		m_log.Log(LogMask::Debug, "HTTPFile::Open",
 				  "File opened for writing:", path);
@@ -113,7 +113,7 @@ int HTTPFile::Open(const char *path, int Oflag, mode_t Mode, XrdOucEnv &env) {
 	m_hostname = configured_hostname;
 	m_hostUrl = configured_hostUrl;
 
-	if (!Oflag) {
+	if ((Oflag & O_ACCMODE) == O_RDONLY) {
 		struct stat buf;
 		auto rv = Fstat(&buf);
 		if (rv < 0) {

src/Posc.cc

@@ -24,6 +24,7 @@
 #include <XrdSec/XrdSecEntity.hh>
 #include <XrdSec/XrdSecEntityAttr.hh>
 #include <XrdSys/XrdSysError.hh>
+#include <XrdSys/XrdSysPlatform.hh>
 #include <XrdVersion.hh>
 
 #include <fcntl.h>
@@ -204,10 +205,10 @@ void PoscFileSystem::ExpireFiles() {
 	}
 
 	int rv;
-	char buff[PATH_MAX];
+	char buff[MAXPATHLEN];
 	struct stat sb;
 	bool supportsStatRet = dp->StatRet(&sb) == 0;
-	while ((rv = dp->Readdir(buff, PATH_MAX)) == 0) {
+	while ((rv = dp->Readdir(buff, sizeof(buff))) == 0) {
 		if (buff[0] == '\0') {
 			// No more entries
 			break;

src/S3File.cc

@@ -103,7 +103,7 @@ int S3File::Open(const char *path, int Oflag, mode_t Mode, XrdOucEnv &env) {
 	if (Oflag & O_APPEND) {
 		m_log.Log(LogMask::Info, "Open", "File opened for append:", path);
 	}
-	if (Oflag & (O_RDWR | O_WRONLY)) {
+	if ((Oflag & O_ACCMODE) != O_RDONLY) {
 		m_write_lk.reset(new std::mutex);
 	}
 
@@ -146,7 +146,7 @@ int S3File::Open(const char *path, int Oflag, mode_t Mode, XrdOucEnv &env) {
 
 	// This flag is not set when it's going to be a read operation
 	// so we check if the file exists in order to be able to return a 404
-	if (!Oflag || (Oflag & O_APPEND)) {
+	if (((Oflag & O_ACCMODE) == O_RDONLY) || (Oflag & O_APPEND)) {
 		auto res = Fstat(nullptr);
 		if (res < 0) {
 			return res;

test/CMakeLists.txt

@@ -205,6 +205,7 @@ if (MINIO_BIN AND MC_BIN)
   # Stress-test using the go-wrk binary #
   #######################################
 
+  if( GoWrk )
   add_test( NAME S3::s3_basic::gowrk_test
     COMMAND "${CMAKE_CURRENT_SOURCE_DIR}/s3-gowrk-test.sh" s3_basic )
 
@@ -214,5 +215,6 @@ if (MINIO_BIN AND MC_BIN)
       ENVIRONMENT "BINARY_DIR=${CMAKE_BINARY_DIR};WRK_BIN=${GoWrk}"
       ATTACHED_FILES_ON_FAIL "${S3_BASIC_TEST_LOGS}"
   )
+  endif()
 
 endif()

test/http_tests.cc

@@ -89,7 +89,7 @@ TEST(TestHTTPFile, TestList) {
 	fd->StatRet(&statStruct);
 
 	rc = fd->Open("/testdir", O_RDONLY, 0700, env);
-	ASSERT_EQ(rc, -21);
+	ASSERT_EQ(rc, -EISDIR);
 	ASSERT_EQ(fd->Opendir("/testdir", env), 0);
 
 	char buf[255];
@@ -103,12 +103,12 @@ TEST(TestHTTPFile, TestXfer) {
 
 	struct stat si;
 	XrdOucEnv env;
-	auto rc = fs.Stat("/hello_world.txt", &si, 0, &env);
+	auto rc = fs.Stat("/testdir/hello_world.txt", &si, 0, &env);
 	ASSERT_EQ(rc, 0);
 	ASSERT_EQ(si.st_size, 13);
 
 	std::unique_ptr<XrdOssDF> fh(fs.newFile());
-	rc = fh->Open("/hello_world.txt", O_RDONLY, 0700, env);
+	rc = fh->Open("/testdir/hello_world.txt", O_RDONLY, 0700, env);
 	ASSERT_EQ(rc, 0);
 
 	char buf[12];

test/posc_tests.cc

@@ -254,7 +254,7 @@ TEST_F(TestPosc, TempfileUpdate) {
 
 	PoscFile::SetFileUpdateDuration(std::chrono::nanoseconds(100));
 
-	std::this_thread::sleep_for(std::chrono::milliseconds(1));
+	std::this_thread::sleep_for(std::chrono::milliseconds(1500));
 
 	PoscFile::UpdateOpenFiles();