Commit 6ca0965a authored by Michael Davis's avatar Michael Davis
Browse files

Merge branch 'migration_ci_tests' of https://gitlab.cern.ch:8443/cta/CTA into migration_ci_tests

Conflicts:
	continuousintegration/docker/ctafrontend/cc7/etc/yum/pluginconf.d/versionlock.list
	migration/gRPC/CMakeLists.txt
	migration/gRPC/EosImportDirs.cpp
	migration/gRPC/EosImportDirs.hpp
	migration/gRPC/EosImportDirsCmd.cpp
	migration/gRPC/EosImportFiles.cpp
	migration/gRPC/GrpcClient.cpp
	migration/gRPC/GrpcClient.hpp
	migration/gRPC/GrpcUtils.cpp
parents 0cffbb17 b7e21512
<<<<<<< HEAD
0:eos-archive-4.5.8-20190910135615gitd3acb55.el7.cern.x86_64
0:eos-cleanup-4.5.8-20190910135615gitd3acb55.el7.cern.x86_64
0:eos-client-4.5.8-20190910135615gitd3acb55.el7.cern.x86_64
......@@ -13,6 +14,22 @@
0:eos-srm-4.5.8-20190910135615gitd3acb55.el7.cern.x86_64
0:eos-test-4.5.8-20190910135615gitd3acb55.el7.cern.x86_64
0:eos-testkeytab-4.5.8-20190910135615gitd3acb55.el7.cern.x86_64
=======
0:eos-archive-4.5.6-20190829163023gite72c345.el7.cern.x86_64
0:eos-cleanup-4.5.6-20190829163023gite72c345.el7.cern.x86_64
0:eos-client-4.5.6-20190829163023gite72c345.el7.cern.x86_64
0:eos-debuginfo-4.5.6-20190829163023gite72c345.el7.cern.x86_64
0:eos-fuse-4.5.6-20190829163023gite72c345.el7.cern.x86_64
0:eos-fuse-core-4.5.6-20190829163023gite72c345.el7.cern.x86_64
0:eos-fuse-sysv-4.5.6-20190829163023gite72c345.el7.cern.x86_64
0:eos-fusex-4.5.6-20190829163023gite72c345.el7.cern.x86_64
0:eos-fusex-core-4.5.6-20190829163023gite72c345.el7.cern.x86_64
0:eos-fusex-selinux-4.5.6-20190829163023gite72c345.el7.cern.x86_64
0:eos-server-4.5.6-20190829163023gite72c345.el7.cern.x86_64
0:eos-srm-4.5.6-20190829163023gite72c345.el7.cern.x86_64
0:eos-test-4.5.6-20190829163023gite72c345.el7.cern.x86_64
0:eos-testkeytab-4.5.6-20190829163023gite72c345.el7.cern.x86_64
>>>>>>> b7e21512629007f604f1230efd701e6d50d1e799
1:python2-xrootd-4.10.0-1.el7.*
1:python3-xrootd-4.10.0-1.el7.*
1:xrootd-4.10.0-1.el7.*
......
......@@ -73,6 +73,15 @@ CREATE GLOBAL TEMPORARY TABLE CTADirsFailedTemp(
filemode INTEGER, ctime INTEGER, mtime INTEGER, classid INTEGER, retc INTEGER, message VARCHAR2(1024))
ON COMMIT PRESERVE ROWS;
CREATE TABLE CTADirsFailed(
fileid INTEGER NOT NULL PRIMARY KEY, depth INTEGER, path VARCHAR2(2048), disk_uid INTEGER, disk_gid INTEGER,
filemode INTEGER, ctime INTEGER, mtime INTEGER, classid INTEGER, retc INTEGER, message VARCHAR2(1024));
CREATE GLOBAL TEMPORARY TABLE CTADirsFailedTemp(
fileid INTEGER NOT NULL PRIMARY KEY, depth INTEGER, path VARCHAR2(2048), disk_uid INTEGER, disk_gid INTEGER,
filemode INTEGER, ctime INTEGER, mtime INTEGER, classid INTEGER, retc INTEGER, message VARCHAR2(1024))
ON COMMIT PRESERVE ROWS;
-- Table to store the logs of the migration operations
CREATE TABLE CTAMigrationLog (timestamp NUMBER, client VARCHAR2(100), tapepool VARCHAR2(15), message VARCHAR2(2000));
......
......@@ -29,7 +29,11 @@ set_property(TARGET eos-import-dirs APPEND PROPERTY INSTALL_RPATH ${PROTOBUF3_RP
set_property(TARGET eos-import-dirs APPEND PROPERTY INSTALL_RPATH ${ORACLE-INSTANTCLIENT_RPATH})
# File import tool
<<<<<<< HEAD
add_executable(eos-import-files EosImportFilesCmd.cpp EosImportFiles.cpp GrpcClient.cpp GrpcUtils.cpp)
=======
add_executable(eos-import-files EosImportFiles.cpp GrpcClient.cpp GrpcUtils.cpp)
>>>>>>> b7e21512629007f604f1230efd701e6d50d1e799
target_link_libraries(eos-import-files EosMigration ${PROTOBUF3_LIBRARIES} ${GRPC_LIBRARY} ${GRPC_GRPC++_LIBRARY} ctacatalogue)
set_property(TARGET eos-import-files APPEND PROPERTY INSTALL_RPATH ${PROTOBUF3_RPATH})
set_property(TARGET eos-import-files APPEND PROPERTY INSTALL_RPATH ${ORACLE-INSTANTCLIENT_RPATH})
......@@ -41,6 +45,10 @@ set_property(TARGET eos-import-files APPEND PROPERTY INSTALL_RPATH ${ORACLE-INST
#set_property(TARGET eos-insert-missing-dirs APPEND PROPERTY INSTALL_RPATH ${ORACLE-INSTANTCLIENT_RPATH})
# Standalone test tools
<<<<<<< HEAD
=======
>>>>>>> b7e21512629007f604f1230efd701e6d50d1e799
#add_executable(grpc-utils-test GrpcUtilsTest.cpp GrpcUtils.cpp)
add_executable(eos-test-dir-inject EosTestDirInject.cpp GrpcClient.cpp GrpcUtils.cpp)
......
grpc-proto @ 4fe93ffc
Subproject commit b3f2149dc69dad7b1e543b53291369a6ee290013
Subproject commit 4fe93ffcafbf8673c0b00bd99523c468ff8e6df3
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment