diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7d311e83f2f4f96da836cc88463ee6eb66ab70a1..b5ac62eb0b17bebb2c3092f79b269cea1021fb6d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -29,8 +29,11 @@ set(CMAKE_DISABLE_SOURCE_CHANGES ON)
set(CMAKE_DISABLE_IN_SOURCE_BUILD ON)
list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake)
+include_directories(${CMAKE_SOURCE_DIR})
+
add_subdirectory(libs)
add_subdirectory(objectstore)
+add_subdirectory(objectstore_middletier)
add_subdirectory(tests)
add_subdirectory(xroot_clients)
add_subdirectory(xroot_plugins)
diff --git a/objectstore/AdminUsersList.cpp b/objectstore/AdminUsersList.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..9b3676f348a9645af300980fa0407e4639a4a774
--- /dev/null
+++ b/objectstore/AdminUsersList.cpp
@@ -0,0 +1,31 @@
+#include "AdminUsersList.hpp"
+
+namespace cta { namespace objectstore {
+
+AdminUsersList::AdminUsersList(Backend& os):
+ ObjectOps<serializers::AdminUsersList>(os) {}
+
+AdminUsersList::AdminUsersList(const std::string & name, Backend& os):
+ ObjectOps<serializers::AdminUsersList>(os, name) {}
+
+void AdminUsersList::add(const cta::AdminUser& adminUser) {
+ // Check that the admin user is not already present
+ ::google::protobuf::RepeatedPtrField<serializers::AdminUser>* list =
+ m_payload.mutable_element();
+ for (size_t i=0; i<(size_t)list->size(); i++) {
+ if (adminUser.getUser().getUid() == list->Get(i).user().uid()) {
+ throw cta::exception::Exception("Attempt to duplicate entry in AdminUsersList");
+ }
+ }
+ // Insert the new admin user
+ serializers::AdminUser * newEntry = list->Add();
+ // Set the content of the new entry
+ newEntry->mutable_user()->set_uid(adminUser.getUser().getUid());
+ newEntry->mutable_user()->set_gid(adminUser.getUser().getUid());
+ newEntry->mutable_creator()->set_uid(adminUser.getCreator().getUid());
+ newEntry->mutable_creator()->set_gid(adminUser.getCreator().getGid());
+ newEntry->set_creationtime(adminUser.getCreationTime());
+ newEntry->set_comment(adminUser.getComment());
+}
+
+}}
\ No newline at end of file
diff --git a/objectstore/AdminUsersList.hpp b/objectstore/AdminUsersList.hpp
new file mode 100644
index 0000000000000000000000000000000000000000..cfbf0ac42b7db0cf1a24aaa6dd188c16e2f811b9
--- /dev/null
+++ b/objectstore/AdminUsersList.hpp
@@ -0,0 +1,22 @@
+#pragma once
+
+#include "ObjectOps.hpp"
+#include "objectstore/cta.pb.h"
+#include "libs/middletier/AdminUser.hpp"
+
+namespace cta { namespace objectstore {
+
+/**
+ * Class containing the list of admin users
+ */
+
+class AdminUsersList: public ObjectOps<serializers::AdminUsersList> {
+public:
+ AdminUsersList(Backend & os);
+
+ AdminUsersList(const std::string & name, Backend & os);
+
+ void add(const cta::AdminUser & adminUser);
+};
+
+}}
\ No newline at end of file
diff --git a/objectstore/BackendTest.cpp b/objectstore/BackendTest.cpp
index 7f8b1062fdc6e4321b54853b844ace45952419a6..ccf819629e180b3bc675a43255cfd928e882921b 100644
--- a/objectstore/BackendTest.cpp
+++ b/objectstore/BackendTest.cpp
@@ -3,6 +3,8 @@
#include "BackendRados.hpp"
#include "exception/Exception.hpp"
+namespace unitTests {
+
TEST_P(BackendAbstractTest, BasicReadWrite) {
std::cout << "Type=" << m_os->typeName() << std::endl;
const std::string testValue = "1234";
@@ -63,4 +65,6 @@ cta::objectstore::BackendRados osRados("tapetest", "tapetest");
INSTANTIATE_TEST_CASE_P(BackendTest, BackendAbstractTest, ::testing::Values(&osVFS, &osRados));
#else
INSTANTIATE_TEST_CASE_P(BackendTest, BackendAbstractTest, ::testing::Values((cta::objectstore::Backend*)&osVFS));
-#endif
\ No newline at end of file
+#endif
+
+}
diff --git a/objectstore/BackendTest.hpp b/objectstore/BackendTest.hpp
index 94acd8eca9c1ef24d902fc8ab256531c7eee4776..7a97838705751bd78abc93169a01e5efa5542b76 100644
--- a/objectstore/BackendTest.hpp
+++ b/objectstore/BackendTest.hpp
@@ -3,6 +3,8 @@
#include <gtest/gtest.h>
#include "Backend.hpp"
+namespace unitTests {
+
class BackendAbstractTest: public ::testing::TestWithParam<cta::objectstore::Backend *> {
protected:
BackendAbstractTest() {}
@@ -11,3 +13,6 @@ protected:
}
cta::objectstore::Backend * m_os;
};
+
+}
+
diff --git a/objectstore/CMakeLists.txt b/objectstore/CMakeLists.txt
index 8cfc03e97d26acbb3f8249881203ad370ad756ba..f24a7b4a1283b8117bd80f6a0c873e1ed1a26feb 100644
--- a/objectstore/CMakeLists.txt
+++ b/objectstore/CMakeLists.txt
@@ -16,6 +16,7 @@ add_library (CTAObjectStore
Agent.cpp
AgentRegister.cpp
AgentWatchdog.cpp
+ AdminUsersList.cpp
BackendVFS.cpp
BackendRados.cpp
ObjectOps.cpp
diff --git a/objectstore/FIFOTest.cpp b/objectstore/FIFOTest.cpp
index d088cca03a1f973d8eef0c4a24d0c89f09a657aa..a8ceb281c729313616c938651ef52540e98681a5 100644
--- a/objectstore/FIFOTest.cpp
+++ b/objectstore/FIFOTest.cpp
@@ -4,6 +4,8 @@
#include "FIFO.hpp"
#include "Agent.hpp"
+namespace unitTests {
+
TEST(FIFO, BasicFuctionnality) {
cta::objectstore::BackendVFS be;
cta::objectstore::Agent agent(be);
@@ -68,4 +70,6 @@ TEST(FIFO, BasicFuctionnality) {
ASSERT_EQ(0, ff.size());
ff.remove();
ASSERT_EQ(false, ff.exists());
-}
\ No newline at end of file
+}
+
+}
diff --git a/objectstore/GarbageCollectorTest.cpp b/objectstore/GarbageCollectorTest.cpp
index d5bf4ef1c54b71a006091aa06d47d5b7f098f349..8f3d0900fc1b39c7178dc760540c6e8d2e2912ca 100644
--- a/objectstore/GarbageCollectorTest.cpp
+++ b/objectstore/GarbageCollectorTest.cpp
@@ -7,6 +7,8 @@
#include "AgentRegister.hpp"
#include "RootEntry.hpp"
+namespace unitTests {
+
TEST(GarbageCollector, BasicFuctionnality) {
cta::objectstore::BackendVFS be;
cta::objectstore::Agent agent(be);
@@ -80,4 +82,6 @@ TEST(GarbageCollector, BasicFuctionnality) {
ffLock.lock(ff);
ff.fetch();
ASSERT_EQ(100, ff.size());
-}
\ No newline at end of file
+}
+
+}
diff --git a/objectstore/RootEntry.hpp b/objectstore/RootEntry.hpp
index 1ac27450abc79a16a68147b303bc9e621c20a539..00c2a131999275f25507290298f419fbd9da3d7f 100644
--- a/objectstore/RootEntry.hpp
+++ b/objectstore/RootEntry.hpp
@@ -34,6 +34,12 @@ public:
// Get the name of a (possibly freshly created) job pool
std::string allocateOrGetJobPool(Agent & agent);
+ // Get the name of the AdminUsersList (or exception if not available)
+ std::string getAdminUsersList();
+
+ // Get the name of a (possibly freshly created) AdminUsersList
+ std::string allocateOrGetAdminUsersList(Agent & agent);
+
private:
void addIntendedAgentRegistry(const std::string & name);
diff --git a/objectstore/RootEntryTest.cpp b/objectstore/RootEntryTest.cpp
index 7548a46899332410a27f4c6504f49f8919acb322..6f70cf61fba3e722b960f66bc0fc93a09cd41c21 100644
--- a/objectstore/RootEntryTest.cpp
+++ b/objectstore/RootEntryTest.cpp
@@ -4,6 +4,8 @@
#include "RootEntry.hpp"
#include "Agent.hpp"
+namespace unitTests {
+
TEST(RootEntry, BasicAccess) {
cta::objectstore::BackendVFS be;
{
@@ -39,4 +41,6 @@ TEST(RootEntry, BasicAccess) {
cta::objectstore::ScopedExclusiveLock lock(re);
re.remove();
ASSERT_EQ(false, re.exists());
-}
\ No newline at end of file
+}
+
+}
diff --git a/objectstore/cta.proto b/objectstore/cta.proto
index d2815b227e8be01d935e04480355c0a10b78b785..790e4e3a82b43b2a4e717f85d587683ac4e6f51e 100644
--- a/objectstore/cta.proto
+++ b/objectstore/cta.proto
@@ -12,6 +12,7 @@ enum ObjectType {
RecallJob_t = 6;
Counter_t = 7;
FIFO_t = 8;
+ AdminUsersList_t = 9;
GenericObject_t = 1000;
}
@@ -68,6 +69,8 @@ message RootEntry {
repeated string agentregisterintentlog = 92;
optional string jobpool = 93;
repeated string jobpoolintentlog = 94;
+ optional string adminuserslist = 95;
+ repeated string adminuserslistintentlog = 96;
}
// The registers (simple name arrays)
@@ -150,4 +153,20 @@ message RecallFIFO {}
message MigrationFIFO {}
+message UserIdentity {
+ required uint32 uid = 8001;
+ required uint32 gid = 8002;
+}
+
+message AdminUser {
+ required UserIdentity user = 8010;
+ required UserIdentity creator = 8011;
+ required uint64 creationTime = 8012;
+ required string comment = 8013;
+}
+
+message AdminUsersList {
+ repeated AdminUser element = 8020;
+}
+
diff --git a/objectstore/exception/Exception.hpp b/objectstore/exception/Exception.hpp
index b1ca73e7ad578bbdf246d39c2f1eb2caf91bea09..55412a305a592b76a9a00cca9ffa03465e67e121 100644
--- a/objectstore/exception/Exception.hpp
+++ b/objectstore/exception/Exception.hpp
@@ -24,7 +24,7 @@
#pragma once
-#include "exception/Backtrace.hpp"
+#include "objectstore/exception/Backtrace.hpp"
#include <exception>
#include <sstream>
diff --git a/objectstore/tapeResourceManagerTest.cpp b/objectstore/tapeResourceManagerTest.cpp
index 8ca607ec6a7b605b2df1a786d29428f4b293ef2d..df0e13f2aaa3dc3ea43e37965d5cbd4cbc10f660 100644
--- a/objectstore/tapeResourceManagerTest.cpp
+++ b/objectstore/tapeResourceManagerTest.cpp
@@ -15,7 +15,7 @@
#include "Counter.hpp"
#include <math.h>
-
+namespace systemTests {
class jobExecutorThread: public cta::threading::Thread {
public:
@@ -239,3 +239,5 @@ int main(void){
return 0;
}
+
+}
diff --git a/objectstore_middletier/CMakeLists.txt b/objectstore_middletier/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..6df1a3271c69b6f9abdf5d2e83027b1ff8658030
--- /dev/null
+++ b/objectstore_middletier/CMakeLists.txt
@@ -0,0 +1,8 @@
+cmake_minimum_required (VERSION 2.6)
+
+include_directories(${CMAKE_CURRENT_SOURCE_DIR})
+include_directories(${CMAKE_BINARY_DIR})
+
+add_library (CTAObjectStoreMiddleTier
+ ObjectStoreMiddleTier.cpp
+)
\ No newline at end of file
diff --git a/objectstore_middletier/ObjectStoreMiddleTier.cpp b/objectstore_middletier/ObjectStoreMiddleTier.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..5affbd7aac39e84753ed3decde0747117e4f382b
--- /dev/null
+++ b/objectstore_middletier/ObjectStoreMiddleTier.cpp
@@ -0,0 +1,47 @@
+#include "ObjectStoreMiddleTier.hpp"
+#include "objectstore/Backend.hpp"
+#include "objectstore/RootEntry.hpp"
+#include "objectstore/AdminUsersList.hpp"
+#include "../libs/middletier/Exception.hpp"
+
+namespace cta {
+
+//------------------------------------------------------------------------------
+// constructor
+//------------------------------------------------------------------------------
+OStoreMiddleTierAdmin::OStoreMiddleTierAdmin(objectstore::Backend& backend):
+ m_backend(backend) {
+ // check that we can at least access the root entry
+ objectstore::RootEntry re(m_backend);
+ objectstore::ScopedSharedLock reLock(re);
+ re.fetch();
+}
+
+//------------------------------------------------------------------------------
+// destructor
+//------------------------------------------------------------------------------
+OStoreMiddleTierAdmin::~OStoreMiddleTierAdmin() throw() {
+}
+
+//------------------------------------------------------------------------------
+// createAdminUser
+//------------------------------------------------------------------------------
+void OStoreMiddleTierAdmin::createAdminUser(
+ const SecurityIdentity &requester,
+ const UserIdentity &user,
+ const std::string &comment) {
+ // TODO: authz is needed here!
+ // Find the admin users list from the root entry.
+ objectstore::RootEntry re(m_backend);
+ objectstore::ScopedSharedLock reLock(re);
+ re.fetch();
+ objectstore::AdminUsersList aul(re.getAdminUsersList(), m_backend);
+ reLock.release();
+ objectstore::ScopedExclusiveLock auLock(aul);
+ aul.fetch();
+ AdminUser au(user, requester.user, time(NULL), comment);
+ aul.add(au);
+ aul.commit();
+}
+
+}
diff --git a/objectstore_middletier/ObjectStoreMiddleTier.hpp b/objectstore_middletier/ObjectStoreMiddleTier.hpp
new file mode 100644
index 0000000000000000000000000000000000000000..1683594ecb02ece5884bacc70afba90be0d72016
--- /dev/null
+++ b/objectstore_middletier/ObjectStoreMiddleTier.hpp
@@ -0,0 +1,293 @@
+#pragma once
+
+#include "../libs/middletier/MiddleTierAdmin.hpp"
+
+namespace cta {
+
+namespace objectstore {
+ class Backend;
+}
+
+/**
+ * The administration API of the the middle-tier.
+ * ObjectStore based implementation
+ */
+class OStoreMiddleTierAdmin: public MiddleTierAdmin {
+public:
+ /**
+ * Contructor
+ */
+ OStoreMiddleTierAdmin(objectstore::Backend & backend);
+
+ /**
+ * Destructor
+ */
+ virtual ~OStoreMiddleTierAdmin() throw();
+
+ /**
+ * Creates the specified administrator.
+ *
+ * @param requester The identity of the user requesting the creation of the
+ * administrator.
+ * @param user The identity of the administrator.
+ * @param comment The comment describing the sministrator.
+ */
+ virtual void createAdminUser(
+ const SecurityIdentity &requester,
+ const UserIdentity &user,
+ const std::string &comment);
+
+ /**
+ * Deletes the specified administrator.
+ *
+ * @param requester The identity of the user requesting the deletion of the
+ * administrator.
+ * @param user The identity of the administrator.
+ */
+ virtual void deleteAdminUser(
+ const SecurityIdentity &requester,
+ const UserIdentity &user);
+
+ /**
+ * Returns the current list of administrators in lexicographical order.
+ *
+ * @param requester The identity of the user requesting the list.
+ * @return The current list of administrators in lexicographical order.
+ */
+ virtual std::list<AdminUser> getAdminUsers(const SecurityIdentity &requester)
+ const;
+
+ /**
+ * Creates the specified administration host.
+ *
+ * @param requester The identity of the user requesting the creation of the
+ * administration host.
+ * @param hostName The network name of the administration host.
+ * @param comment The comment describing the administration host.
+ */
+ virtual void createAdminHost(
+ const SecurityIdentity &requester,
+ const std::string &hostName,
+ const std::string &comment);
+
+ /**
+ * Deletes the specified administration host.
+ *
+ * @param requester The identity of the user requesting the deletion of the
+ * administration host.
+ * @param hostName The network name of the administration host.
+ * @param comment The comment describing the administration host.
+ */
+ virtual void deleteAdminHost(
+ const SecurityIdentity &requester,
+ const std::string &hostName);
+
+ /**
+ * Returns the current list of administration hosts in lexicographical order.
+ *
+ * @param requester The identity of the user requesting the list.
+ * @return The current list of administration hosts in lexicographical order.
+ */
+ virtual std::list<AdminHost> getAdminHosts(const SecurityIdentity &requester)
+ const;
+
+ /**
+ * Creates the specified storage class.
+ *
+ * @param requester The identity of the user requesting the creation of the
+ * storage class.
+ * @param name The name of the storage class.
+ * @param nbCopies The number of copies a file associated with this storage
+ * class should have on tape.
+ * @param comment The comment describing the storage class.
+ */
+ virtual void createStorageClass(
+ const SecurityIdentity &requester,
+ const std::string &name,
+ const uint8_t nbCopies,
+ const std::string &comment);
+
+ /**
+ * Deletes the specified storage class.
+ *
+ * @param requester The identity of the user requesting the deletion of the
+ * storage class.
+ * @param name The name of the storage class.
+ */
+ virtual void deleteStorageClass(
+ const SecurityIdentity &requester,
+ const std::string &name);
+
+ /**
+ * Gets the current list of storage classes in lexicographical order.
+ *
+ * @param requester The identity of the user requesting the list.
+ * @return The current list of storage classes in lexicographical order.
+ */
+ virtual std::list<StorageClass> getStorageClasses(
+ const SecurityIdentity &requester) const;
+
+ /**
+ * Creates a tape pool with the specifed name.
+ *
+ * @param requester The identity of the user requesting the creation of the
+ * tape pool.
+ * @param name The name of the tape pool.
+ * @param nbDrives The maximum number of drives that can be concurrently
+ * assigned to this pool independent of whether they are archiving or
+ * retrieving files.
+ * @param nbPartialTapes The maximum number of tapes that can be partially
+ * full at any moment in time.
+ * @param comment The comment describing the tape pool.
+ */
+ virtual void createTapePool(
+ const SecurityIdentity &requester,
+ const std::string &name,
+ const uint16_t nbDrives,
+ const uint32_t nbPartialTapes,
+ const std::string &comment);
+
+ /**
+ * Delete the tape pool with the specifed name.
+ *
+ * @param requester The identity of the user requesting the deletion of the
+ * tape pool.
+ * @param name The name of the tape pool.
+ */
+ virtual void deleteTapePool(
+ const SecurityIdentity &requester,
+ const std::string &name);
+
+ /**
+ * Gets the current list of tape pools in lexicographical order.
+ *
+ * @param requester The identity of the user requesting the list.
+ * @return The current list of tape pools in lexicographical order.
+ */
+ virtual std::list<TapePool> getTapePools(
+ const SecurityIdentity &requester) const;
+
+ /**
+ * Creates the specified archive route.
+ *
+ * @param requester The identity of the user requesting the creation of the
+ * archive route.
+ * @param storageClassName The name of the storage class that identifies the
+ * source disk files.
+ * @param copyNb The tape copy number.
+ * @param tapePoolName The name of the destination tape pool.
+ * @param comment The comment describing the archive route.
+ */
+ virtual void createArchiveRoute(
+ const SecurityIdentity &requester,
+ const std::string &storageClassName,
+ const uint8_t copyNb,
+ const std::string &tapePoolName,
+ const std::string &comment);
+
+ /**
+ * Deletes the specified archive route.
+ *
+ * @param requester The identity of the user requesting the deletion of the
+ * archive route.
+ * @param storageClassName The name of the storage class that identifies the
+ * source disk files.
+ * @param copyNb The tape copy number.
+ */
+ virtual void deleteArchiveRoute(
+ const SecurityIdentity &requester,
+ const std::string &storageClassName,
+ const uint8_t copyNb);
+
+ /**
+ * Gets the current list of archive routes.
+ *
+ * @param requester The identity of the user requesting the list.
+ */
+ virtual std::list<ArchiveRoute> getArchiveRoutes(
+ const SecurityIdentity &requester) const;
+
+ /**
+ * Creates a logical library with the specified name.
+ *
+ * @param requester The identity of the user requesting the creation of the
+ * logical library.
+ * @param name The name of the logical library.
+ * @param comment The comment describing the logical library.
+ */
+ virtual void createLogicalLibrary(
+ const SecurityIdentity &requester,
+ const std::string &name,
+ const std::string &comment);
+
+ /**
+ * Deletes the logical library with the specified name.
+ *
+ * @param requester The identity of the user requesting the deletion of the
+ * logical library.
+ * @param name The name of the logical library.
+ */
+ virtual void deleteLogicalLibrary(
+ const SecurityIdentity &requester,
+ const std::string &name);
+
+ /**
+ * Returns the current list of libraries in lexicographical order.
+ *
+ * @param requester The identity of the user requesting the list.
+ * @return The current list of libraries in lexicographical order.
+ */
+ virtual std::list<LogicalLibrary> getLogicalLibraries(
+ const SecurityIdentity &requester) const;
+
+ /**
+ * Creates a tape.
+ *
+ * @param requester The identity of the user requesting the creation of the
+ * tape.
+ * @param vid The volume identifier of the tape.
+ * @param logicalLibrary The name of the logical library to which the tape
+ * belongs.
+ * @param tapePoolName The name of the tape pool to which the tape belongs.
+ * @param capacityInBytes The capacity of the tape.
+ * @param comment The comment describing the logical library.
+ */
+ virtual void createTape(
+ const SecurityIdentity &requester,
+ const std::string &vid,
+ const std::string &logicalLibraryName,
+ const std::string &tapePoolName,
+ const uint64_t capacityInBytes,
+ const std::string &comment);
+
+ /**
+ * Deletes the tape with the specified volume identifier.
+ *
+ * @param requester The identity of the user requesting the deletion of the
+ * tape.
+ * @param vid The volume identifier of the tape.
+ */
+ virtual void deleteTape(
+ const SecurityIdentity &requester,
+ const std::string &vid);
+
+ /**
+ * Returns the current list of tapes in the lexicographical order of their
+ * volume identifiers.
+ *
+ * @param requester The identity of the user requesting the list.
+ * @return The current list of tapes in the lexicographical order of their
+ * volume identifiers.
+ */
+ virtual std::list<Tape> getTapes(
+ const SecurityIdentity &requester) const;
+
+private:
+ /**
+ * Reference to the backend used for storing objects
+ */
+ objectstore::Backend & m_backend;
+};
+
+}
+