CCDB: Don't require an alien token on EPN / FLP

davidrohr · davidrohr · commit 94158729a2ab · 2022-05-26T22:15:43.000+02:00
diff --git a/CCDB/include/CCDB/CcdbApi.h b/CCDB/include/CCDB/CcdbApi.h
@@ -522,6 +522,7 @@ class CcdbApi //: public DatabaseInterface
   bool mPreferSnapshotCache = false; // if snapshot is available, don't try to query its validity even in non-snapshot backend mode
   bool mInSnapshotMode = false;
   mutable TGrid* mAlienInstance = nullptr;                       // a cached connection to TGrid (needed for Alien locations)
+  bool mNeedAlienToken = true;                                   // On EPN and FLP we use a local cache and don't need the alien token
   static std::unique_ptr<TJAlienCredentials> mJAlienCredentials; // access JAliEn credentials
 
   ClassDefNV(CcdbApi, 1);
diff --git a/CCDB/src/CcdbApi.cxx b/CCDB/src/CcdbApi.cxx
@@ -119,6 +119,8 @@ void CcdbApi::init(std::string const& host)
     snapshotReport += ')';
   }
 
+  mNeedAlienToken = host != "http://o2-ccdb.internal" && host != "http://localhost:8084" && host != "http://127.0.0.1:8084";
+
   LOGP(info, "Init CcdApi with UserAgentID: {}, Host: {}{}", mUniqueAgentID, host,
        mInSnapshotMode ? "(snapshot readonly mode)" : snapshotReport.c_str());
 }
@@ -723,7 +725,7 @@ void* CcdbApi::extractFromLocalFile(std::string const& filename, std::type_info
 
 bool CcdbApi::initTGrid() const
 {
-  if (!mAlienInstance) {
+  if (mNeedAlienToken && !mAlienInstance) {
     mAlienInstance = TGrid::Connect("alien");
     static bool errorShown = false;
     if (!mAlienInstance && errorShown == false) {
diff --git a/prodtests/full-system-test/dpl-workflow.sh b/prodtests/full-system-test/dpl-workflow.sh
@@ -5,7 +5,7 @@
 MYDIR="$(dirname $(realpath $0))"
 source $MYDIR/setenv.sh
 
-if [[ $EPNSYNCMODE == 0 && $DPL_CONDITION_BACKEND != "http://o2-ccdb.internal" && $DPL_CONDITION_BACKEND != "http://localhost:8084" ]]; then
+if [[ $EPNSYNCMODE == 0 && $DPL_CONDITION_BACKEND != "http://o2-ccdb.internal" && $DPL_CONDITION_BACKEND != "http://localhost:8084" && $DPL_CONDITION_BACKEND != "http://127.0.0.1:8084" ]]; then
   alien-token-info >& /dev/null
   if [[ $? != 0 ]]; then
     echo "No alien token present" 1>&2

Original file line number	Diff line number	Diff line change
`@@ -119,6 +119,8 @@ void CcdbApi::init(std::string const& host)`
`119`	`119`	`snapshotReport += ')';`
`120`	`120`	`}`
`121`	`121`
	`122`	`+ mNeedAlienToken = host != "http://o2-ccdb.internal" && host != "http://localhost:8084" && host != "http://127.0.0.1:8084";`
	`123`	`+`
`122`	`124`	`LOGP(info, "Init CcdApi with UserAgentID: {}, Host: {}{}", mUniqueAgentID, host,`
`123`	`125`	`mInSnapshotMode ? "(snapshot readonly mode)" : snapshotReport.c_str());`
`124`	`126`	`}`
`@@ -723,7 +725,7 @@ void* CcdbApi::extractFromLocalFile(std::string const& filename, std::type_info`
`723`	`725`
`724`	`726`	`bool CcdbApi::initTGrid() const`
`725`	`727`	`{`
`726`		`- if (!mAlienInstance) {`
	`728`	`+ if (mNeedAlienToken && !mAlienInstance) {`
`727`	`729`	`mAlienInstance = TGrid::Connect("alien");`
`728`	`730`	`static bool errorShown = false;`
`729`	`731`	`if (!mAlienInstance && errorShown == false) {`