From 261ded5ca56a5a3e061694c92afc429cd9eee24b Mon Sep 17 00:00:00 2001
From: Michael Davis <michael.davis@cern.ch>
Date: Tue, 2 Jul 2019 17:10:49 +0200
Subject: [PATCH] Better solution: initialise owner_uid and gid to 0 in
DiskFileInfo() constructor
---
common/dataStructures/DiskFileInfo.cpp | 2 +-
.../tape/tapeserver/daemon/DataTransferSessionTest.cpp | 10 ----------
2 files changed, 1 insertion(+), 11 deletions(-)
diff --git a/common/dataStructures/DiskFileInfo.cpp b/common/dataStructures/DiskFileInfo.cpp
index 4091f967a4..c9454e5b48 100644
--- a/common/dataStructures/DiskFileInfo.cpp
+++ b/common/dataStructures/DiskFileInfo.cpp
@@ -27,7 +27,7 @@ namespace dataStructures {
//------------------------------------------------------------------------------
// constructor
//------------------------------------------------------------------------------
-DiskFileInfo::DiskFileInfo() {}
+DiskFileInfo::DiskFileInfo() : owner_uid(0), gid(0) {}
//------------------------------------------------------------------------------
// constructor
diff --git a/tapeserver/castor/tape/tapeserver/daemon/DataTransferSessionTest.cpp b/tapeserver/castor/tape/tapeserver/daemon/DataTransferSessionTest.cpp
index 1a15a7b90d..9f10d83ab7 100644
--- a/tapeserver/castor/tape/tapeserver/daemon/DataTransferSessionTest.cpp
+++ b/tapeserver/castor/tape/tapeserver/daemon/DataTransferSessionTest.cpp
@@ -459,8 +459,6 @@ TEST_P(DataTransferSessionTest, DataTransferSessionGooddayRecall) {
rReq.requester.name = s_userName;
rReq.requester.group = "someGroup";
rReq.dstURL = remoteFilePaths.back();
- rReq.diskFileInfo.owner_uid = DISK_FILE_SOME_USER;
- rReq.diskFileInfo.gid = DISK_FILE_SOME_GROUP;
std::list<std::string> archiveFilePaths;
scheduler.queueRetrieve(diskInstance, rReq, logContext);
}
@@ -666,8 +664,6 @@ TEST_P(DataTransferSessionTest, DataTransferSessionWrongRecall) {
rReq.requester.name = s_userName;
rReq.requester.group = "someGroup";
rReq.dstURL = remoteFilePaths.back();
- rReq.diskFileInfo.owner_uid = DISK_FILE_SOME_USER;
- rReq.diskFileInfo.gid = DISK_FILE_SOME_GROUP;
std::list<std::string> archiveFilePaths;
scheduler.queueRetrieve(diskInstance, rReq, logContext);
}
@@ -842,8 +838,6 @@ TEST_P(DataTransferSessionTest, DataTransferSessionRAORecall) {
rReq.requester.name = s_userName;
rReq.requester.group = "someGroup";
rReq.dstURL = remoteFilePaths.back();
- rReq.diskFileInfo.owner_uid = DISK_FILE_SOME_USER;
- rReq.diskFileInfo.gid = DISK_FILE_SOME_GROUP;
std::list<std::string> archiveFilePaths;
scheduler.queueRetrieve(diskInstance, rReq, logContext);
@@ -1054,8 +1048,6 @@ TEST_P(DataTransferSessionTest, DataTransferSessionNoSuchDrive) {
rReq.requester.name = s_userName;
rReq.requester.group = "someGroup";
rReq.dstURL = remoteFilePaths.back();
- rReq.diskFileInfo.owner_uid = DISK_FILE_SOME_USER;
- rReq.diskFileInfo.gid = DISK_FILE_SOME_GROUP;
std::list<std::string> archiveFilePaths;
scheduler.queueRetrieve(diskInstance, rReq, logContext);
}
@@ -1203,8 +1195,6 @@ TEST_P(DataTransferSessionTest, DataTransferSessionFailtoMount) {
rReq.requester.name = s_userName;
rReq.requester.group = "someGroup";
rReq.dstURL = remoteFilePaths.back();
- rReq.diskFileInfo.owner_uid = DISK_FILE_SOME_USER;
- rReq.diskFileInfo.gid = DISK_FILE_SOME_GROUP;
std::list<std::string> archiveFilePaths;
scheduler.queueRetrieve(diskInstance, rReq, logContext);
}
--
GitLab