Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add explicit header that is no longer brought in by default. #4882

Merged
1 commit merged into from
Aug 7, 2014

Conversation

bbockelm
Copy link
Contributor

@bbockelm bbockelm commented Aug 5, 2014

Xrootd 4.0.2 re-arranged some headers; one of the ones we use (XrdClient/XrdClientConn.hh) is now marked as private and no longer implicitly dragged in as part of the XrdClient.hh. Hence, we must explicitly include it.

This is part of the transition-to-Xrootd-4.0.2 work. We'll need to use the private headers for awhile to rebase to the latest external (prior to converting the new client).

@cmsbuild
Copy link
Contributor

cmsbuild commented Aug 5, 2014

A new Pull Request was created by @bbockelm (Brian Bockelman) for CMSSW_7_2_X.

Add explicit header that is no longer brought in by default.

It involves the following packages:

Utilities/XrdAdaptor

@cmsbuild, @Degano, @Dr15Jones, @ktf, @nclopezo can you please review it and eventually sign? Thanks.
@wddgit this is something you requested to watch as well.
You can sign-off by replying to this message having '+1' in the first line of your reply.
You can reject by replying to this message having '-1' in the first line of your reply.

@ktf
Copy link
Contributor

ktf commented Aug 5, 2014

+1

@cmsbuild
Copy link
Contributor

cmsbuild commented Aug 5, 2014

This pull request is fully signed and it will be integrated in one of the next CMSSW_7_2_X IBs unless changes or unless it breaks tests.

@ghost
Copy link

ghost commented Aug 6, 2014

This PR is being tested right now against CMSSW_7_2_X_2014-08-04-1400 IB which had xrootd 4.0.2 active.

@cmsbuild
Copy link
Contributor

cmsbuild commented Aug 6, 2014

-1
Tested at: 434cb52
I found an error when building:

>> Compiling  /build/cmsbuild/jenkins-workarea/workspace/ib-integration-CMSSW_7_2_X-slc6_amd64_gcc481/CMSSW_7_2_X_2014-08-04-1400/src/Utilities/XrdAdaptor/src/XrdReadv.cc 
>> Compiling  /build/cmsbuild/jenkins-workarea/workspace/ib-integration-CMSSW_7_2_X-slc6_amd64_gcc481/CMSSW_7_2_X_2014-08-04-1400/src/FWCore/Version/src/GetFileFormatVersion.cc 
>> Compiling  /build/cmsbuild/jenkins-workarea/workspace/ib-integration-CMSSW_7_2_X-slc6_amd64_gcc481/CMSSW_7_2_X_2014-08-04-1400/src/FWCore/Version/src/GetReleaseVersion.cc 
>> Compiling edm plugin /build/cmsbuild/jenkins-workarea/workspace/ib-integration-CMSSW_7_2_X-slc6_amd64_gcc481/CMSSW_7_2_X_2014-08-04-1400/src/Utilities/XrdAdaptor/plugins/XrdStorageMaker.cc 
>> Building shared library tmp/slc6_amd64_gcc481/src/FWCore/Version/src/FWCoreVersion/libFWCoreVersion.so
/build/cmsbuild/jenkins-workarea/workspace/ib-integration-CMSSW_7_2_X-slc6_amd64_gcc481/CMSSW_7_2_X_2014-08-04-1400/src/Utilities/XrdAdaptor/src/XrdReadv.cc:19:38: fatal error: XrdClient/XrdClientConn.hh: No such file or directory
 #include "XrdClient/XrdClientConn.hh"
                                      ^
compilation terminated.
Copying tmp/slc6_amd64_gcc481/src/FWCore/Version/src/FWCoreVersion/libFWCoreVersion.so to productstore area:
/build/cmsbuild/jenkins-workarea/workspace/ib-integration-CMSSW_7_2_X-slc6_amd64_gcc481/CMSSW_7_2_X_2014-08-04-1400/src/Utilities/XrdAdaptor/src/XrdFile.cc:10:38: fatal error: XrdClient/XrdClientConn.hh: No such file or directory


you can see the results of the tests here:
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-4882/557/summary.html

@cmsbuild
Copy link
Contributor

cmsbuild commented Aug 6, 2014

This pull request is fully signed and it will be integrated in one of the next CMSSW_7_2_X IBs unless changes (but tests are reportedly failing).

@ktf
Copy link
Contributor

ktf commented Aug 6, 2014

I guess this needs to go in together with the new Xrootd.

@ghost
Copy link

ghost commented Aug 6, 2014

@ktf the IB I used to test this: CMSSW_7_2_X_2014-08-04-1400 has xrootd 4.0.2.

@bbockelm
Copy link
Contributor Author

bbockelm commented Aug 6, 2014

Shoot - @ktf is right - that header is not visible until the new Xrootd 4.0.2 external lands. So, we'll have to wait.

@ktf
Copy link
Contributor

ktf commented Aug 6, 2014

I think Alessandro tried also with the new external.

@bbockelm
Copy link
Contributor Author

bbockelm commented Aug 6, 2014

Are you sure? We talked about doing a rebuild of xrootd 4.0.2 yesterday including the "private" subdirectory (plus a few other headers) in the toolfile. I see this header here:

/afs/cern.ch/cms/sw/ReleaseCandidates/vol0/slc6_amd64_gcc481/external/xrootd/4.0.2/include/xrootd/private/XrdClient/XrdClientConn.hh

so it should be found if we did the corresponding toolfile update.

@ktf
Copy link
Contributor

ktf commented Aug 6, 2014

I think that's the actual question. Do you really want to have
-I$XROOTD_ROOT/include/private in the include path?

Ciao,
Giulio

On 6 Aug 2014, at 16:36, Brian Bockelman wrote:

Are you sure? We talked about doing a rebuild of xrootd 4.0.2
yesterday including the "private" subdirectory (plus a few other
headers) in the toolfile. I see this header here:

/afs/cern.ch/cms/sw/ReleaseCandidates/vol0/slc6_amd64_gcc481/external/xrootd/4.0.2/include/xrootd/private/XrdClient/XrdClientConn.hh

so it should be found if we did the corresponding toolfile update.


Reply to this email directly or view it on GitHub:
#4882 (comment)

@bbockelm
Copy link
Contributor Author

bbockelm commented Aug 6, 2014

Yup - the newer Xrootd release moved headers around and we need to access the ones now marked as "private".

@ktf
Copy link
Contributor

ktf commented Aug 6, 2014

ok. Alex can you add that to the toolfile?

On 6 Aug 2014, at 16:48, Brian Bockelman wrote:

Yup - the newer Xrootd release moved headers around and we need to
access the ones now marked as "private".


Reply to this email directly or view it on GitHub:
#4882 (comment)

@bbockelm
Copy link
Contributor Author

bbockelm commented Aug 6, 2014

Also - to completely mix the two issues - from my email:

- Add the following files to the private directory:
 - src/XrdClient/XrdClientProtocol.hh
 - src/XrdClient/XrdClientSid.hh
 (You can do this by copying them over after "make install" or add them to XROOTD_PRIVATE_HEADERS around line 102 of src/XrdHeaders.cmake.)

@ghost
Copy link

ghost commented Aug 7, 2014

+1
Tested by hand alongside cms-sw/cmsdist#922

@cmsbuild
Copy link
Contributor

cmsbuild commented Aug 7, 2014

This pull request is fully signed and it will be integrated in one of the next CMSSW_7_2_X IBs unless changes (tests are also fine).

ghost pushed a commit that referenced this pull request Aug 7, 2014
Add explicit header that is no longer brought in by default.
@ghost ghost merged commit 911f841 into cms-sw:CMSSW_7_2_X Aug 7, 2014
This pull request was closed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants