Skip to content

Commit 1a7ff9c

Browse files
makortelmakortel
committed
Remove last references to rfio from framework and related code
1 parent 907d459 commit 1a7ff9c

File tree

15 files changed

+11
-243
lines changed

15 files changed

+11
-243
lines changed

‎FWCore/Catalog/interface/SiteLocalConfig.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,6 @@ namespace edm {
6161
virtual std::vector<edm::CatalogAttributes> const& dataCatalogs() const = 0;
6262
virtual std::filesystem::path const storageDescriptionPath(const edm::CatalogAttributes& aDataCatalog) const = 0;
6363
virtual std::string const lookupCalibConnect(std::string const& input) const = 0;
64-
virtual std::string const rfioType(void) const = 0;
6564

6665
virtual std::string const* sourceCacheTempDir() const = 0;
6766
virtual double const* sourceCacheMinFree() const = 0;

‎FWCore/Catalog/test/FileLocator_t.cpp‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ TEST_CASE("FileLocator with Rucio data catalog", "[FWCore/Catalog]") {
3434
"file:bha",
3535
"file:/bha/bho",
3636
"/castor/cern.ch/cms/bha/bho",
37-
"rfio:/castor/cern.ch/cms/bha/bho",
38-
"rfio:/bha/bho"}};
37+
"someprotocol:/castor/cern.ch/cms/bha/bho",
38+
"someprotocol:/bha/bho"}};
3939
CHECK("root://cmsdcadisk.fnal.gov//dcache/uscmsdisk/store/group/bha/bho" ==
4040
fl.pfn("/store/group/bha/bho", edm::CatalogType::RucioCatalog));
4141
for (auto file : lfn) {
@@ -53,8 +53,8 @@ TEST_CASE("FileLocator with Rucio data catalog", "[FWCore/Catalog]") {
5353
"file:bha",
5454
"file:/bha/bho",
5555
"/castor/cern.ch/cms/bha/bho",
56-
"rfio:/castor/cern.ch/cms/bha/bho",
57-
"rfio:/bha/bho"}};
56+
"someprotocol:/castor/cern.ch/cms/bha/bho",
57+
"someprotocol:/bha/bho"}};
5858
//one level chain between "root" and "second" protocols (see storage.json)
5959
CHECK("root://host.domain//pnfs/cms/store/group/bha/bho" ==
6060
fl.pfn("/store/group/bha/bho", edm::CatalogType::RucioCatalog));
@@ -90,8 +90,8 @@ TEST_CASE("FileLocator with TrivialFileCatalog", "[FWCore/Catalog]") {
9090
"file:bha",
9191
"file:/bha/bho",
9292
"/castor/cern.ch/cms/bha/bho",
93-
"rfio:/castor/cern.ch/cms/bha/bho",
94-
"rfio:/bha/bho"}};
93+
"someprotocol:/castor/cern.ch/cms/bha/bho",
94+
"someprotocol:/bha/bho"}};
9595

9696
CHECK("/storage/path/store/group/bha/bho" == fl.pfn("/store/group/bha/bho", edm::CatalogType::TrivialCatalog));
9797
for (auto file : lfn) {
@@ -115,8 +115,8 @@ TEST_CASE("FileLocator with TrivialFileCatalog", "[FWCore/Catalog]") {
115115
"file:bha",
116116
"file:/bha/bho",
117117
"/castor/cern.ch/cms/bha/bho",
118-
"rfio:/castor/cern.ch/cms/bha/bho",
119-
"rfio:/bha/bho"}};
118+
"someprotocol:/castor/cern.ch/cms/bha/bho",
119+
"someprotocol:/bha/bho"}};
120120

121121
auto const overriden_file =
122122
"/store/unmerged/relval/CMSSW_3_8_0_pre3/RelValZTT/GEN-SIM-DIGI-RAW-HLTDEBUG/START38_V2-v1/0666/"

‎FWCore/Catalog/test/TestSiteLocalConfig.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ namespace edmtest::catalog {
2727
}
2828

2929
std::string const lookupCalibConnect(std::string const& input) const final { return std::string(); }
30-
std::string const rfioType(void) const final { return std::string(); }
3130

3231
std::string const* sourceCacheTempDir() const final { return nullptr; }
3332
double const* sourceCacheMinFree() const final { return nullptr; }

‎FWCore/Services/src/SiteLocalConfigService.cc‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,6 @@ namespace edm {
7878
m_trivialDataCatalogs(),
7979
m_dataCatalogs(),
8080
m_frontierConnect(),
81-
m_rfioType("castor"),
8281
m_connected(false),
8382
m_cacheTempDir(),
8483
m_cacheTempDirPtr(nullptr),
@@ -288,8 +287,6 @@ namespace edm {
288287
return input;
289288
}
290289

291-
std::string const SiteLocalConfigService::rfioType(void) const { return m_rfioType; }
292-
293290
std::string const *SiteLocalConfigService::sourceCacheTempDir() const { return m_cacheTempDirPtr; }
294291

295292
double const *SiteLocalConfigService::sourceCacheMinFree() const { return m_cacheMinFreePtr; }
@@ -355,7 +352,6 @@ namespace edm {
355352
// <subsite name="FNAL_SUBSITE"/>
356353
// <event-data>
357354
// <catalog url="trivialcatalog_file:/x/y/z.xml"/>
358-
// <rfiotype value="castor"/>
359355
// </event-data>
360356
// <calib-data>
361357
// <catalog url="trivialcatalog_file:/x/y/z.xml"/>
@@ -412,10 +408,6 @@ namespace edm {
412408
catalog = catalog->NextSiblingElement("catalog");
413409
}
414410
}
415-
auto rfiotype = eventData->FirstChildElement("rfiotype");
416-
if (rfiotype) {
417-
m_rfioType = safe(rfiotype->Attribute("value"));
418-
}
419411
}
420412

421413
//data-access

‎FWCore/Services/src/SiteLocalConfigService.h‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ namespace edm {
3939
std::vector<edm::CatalogAttributes> const& dataCatalogs() const override;
4040
std::filesystem::path const storageDescriptionPath(edm::CatalogAttributes const& aDataCatalog) const override;
4141
std::string const lookupCalibConnect(std::string const& input) const override;
42-
std::string const rfioType(void) const override;
4342

4443
std::string const* sourceCacheTempDir() const override;
4544
double const* sourceCacheMinFree() const override;
@@ -74,7 +73,6 @@ namespace edm {
7473
std::vector<std::string> m_trivialDataCatalogs;
7574
std::vector<edm::CatalogAttributes> m_dataCatalogs;
7675
std::string m_frontierConnect;
77-
std::string m_rfioType;
7876
bool m_connected;
7977
std::string m_cacheTempDir;
8078
std::string const* m_cacheTempDirPtr;

‎FWCore/Services/test/test_sitelocalconfig_override_cfg.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
sourceCacheHint=cms.untracked.string("storage-only"),
1010
sourceReadHint=cms.untracked.string("direct-unbuffered"),
1111
sourceTTreeCacheSize=cms.untracked.uint32(0),
12-
sourceNativeProtocols=cms.untracked.vstring("rfio"),
12+
sourceNativeProtocols=cms.untracked.vstring("root"),
1313
sourceValuesSet=cms.untracked.bool(True),
1414
expectedUseLocalConnectString = cms.untracked.bool(True),
1515
expectedLocalConnectPrefix = cms.untracked.string("TestOverride:Prefix"),
@@ -23,7 +23,7 @@
2323
overrideSourceCacheTempDir=cms.untracked.string("/x/y/z"),
2424
overrideSourceCacheHintDir=cms.untracked.string("storage-only"),
2525
overrideSourceReadHint=cms.untracked.string("direct-unbuffered"),
26-
overrideSourceNativeProtocols=cms.untracked.vstring("rfio"),
26+
overrideSourceNativeProtocols=cms.untracked.vstring("root"),
2727
overrideSourceTTreeCacheSize=cms.untracked.uint32(0),
2828
overrideUseLocalConnectString = cms.untracked.bool(True),
2929
overrideLocalConnectPrefix = cms.untracked.string("TestOverride:Prefix"),

‎IOPool/TFileAdaptor/src/TFileAdaptor.cc‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -179,8 +179,6 @@ TFileAdaptor::TFileAdaptor(edm::ParameterSet const& pset, edm::ActivityRegistry&
179179
/* always */ addType(mgr, "^web:");
180180
/* always */ addType(mgr, "^gsiftp:");
181181
/* always */ addType(mgr, "^sfn:");
182-
if (!native("rfio"))
183-
addType(mgr, "^rfio:");
184182
if (!native("dcache"))
185183
addType(mgr, "^dcache:");
186184
if (!native("dcap"))

‎IOPool/TFileAdaptor/test/tfileTest.cpp‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,8 @@
1515
#include "FWCore/Utilities/interface/Exception.h"
1616

1717
int main(int argc, char* argv[]) {
18-
/* TestMain tfileTest zip-member:file:bha.zip#bha
19-
TestMain tfileTest rfio:suncmsc.cern.ch:/data/valid/test/vincenzo/testPool/evData/EVD0_EventData.56709894d26a11d78dd20040f45cca94.1.h300eemm.TestSignalHits
20-
TestMain tfileTest zip-member:rfio:suncmsc.cern.ch:/data/valid/test/vincenzo/testZip/test1.zip#file.5 */
21-
2218
char const* protocols[] = {
23-
"^file:", "^http:", "^ftp:", "^web:", "^gsiftp:", "^sfn:", "^rfio:", "^dcache:", "^dcap:", "^gsidcap:"};
19+
"^file:", "^http:", "^ftp:", "^web:", "^gsiftp:", "^sfn:", "^dcache:", "^dcap:", "^gsidcap:"};
2420

2521
char const* tStorageFactoryFileFunc = "TStorageFactoryFile(char const*, Option_t*, char const*, Int_t)";
2622

‎Utilities/StorageFactory/test/BuildFile.xml‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -29,16 +29,6 @@
2929
<flags NO_TESTRUN="1"/>
3030
</bin>
3131

32-
<bin file="rfio2.cpp" name="test_StorageFactory_Rfio2">
33-
</bin>
34-
35-
<bin file="rfio3.cpp" name="test_StorageFactory_Rfio3">
36-
</bin>
37-
38-
<bin file="write.cpp" name="test_StorageFactory_Write">
39-
<flags NO_TESTRUN="1"/>
40-
</bin>
41-
4232
<bin file="mkstemp.cpp" name="test_StorageFactory_Mkstemp">
4333
</bin>
4434

‎Utilities/StorageFactory/test/muli_thread_results‎

Lines changed: 0 additions & 59 deletions
This file was deleted.

0 commit comments

Comments
 (0)