No longer force a new stat to be performed on an open file;

this fails on EOS. Fixup error messages to use the correct ToStr.
cms-sw · Sep 3, 2013 · 2ee6043 · 2ee6043
1 parent 3bbeb09
commit 2ee6043
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/Utilities/XrdAdaptor/src/XrdFile.cc b/Utilities/XrdAdaptor/src/XrdFile.cc
@@ -150,10 +150,10 @@ XrdFile::open (const char *name,
   auto file = getActiveFile();
   XrdCl::XRootDStatus status;
   XrdCl::StatInfo *statInfo = NULL;
-  if (! (status = file->Stat(true, statInfo)).IsOK()) {
+  if (! (status = file->Stat(false, statInfo)).IsOK()) {
     edm::Exception ex(edm::errors::FileOpenError);
     ex << "XrdCl::File::Stat(name='" << name
-       << ") => error '" << status.ToString()
+       << ") => error '" << status.ToStr()
        << "' (errno=" << status.errNo << ", code=" << status.code << ")";
     ex.addContext("Calling XrdFile::open()");
     addConnection(ex);
@@ -343,7 +343,7 @@ XrdFile::write (const void *from, IOSize n)
   if (!s.IsOK()) {
     cms::Exception ex("FileWriteError");
     ex << "XrdFile::write(name='" << m_name << "', n=" << n
-       << ") failed with error '" << s.ToString()
+       << ") failed with error '" << s.ToStr()
        << "' (errno=" << s.errNo << ", code=" << s.code << ")";
     ex.addContext("Calling XrdFile::write()");
     addConnection(ex);
@@ -374,7 +374,7 @@ XrdFile::write (const void *from, IOSize n, IOOffset pos)
   if (!s.IsOK()) {
     cms::Exception ex("FileWriteError");
     ex << "XrdFile::write(name='" << m_name << "', n=" << n
-       << ") failed with error '" << s.ToString()
+       << ") failed with error '" << s.ToStr()
        << "' (errno=" << s.errNo << ", code=" << s.code << ")";
     ex.addContext("Calling XrdFile::write()");
     addConnection(ex);

diff --git a/Utilities/XrdAdaptor/src/XrdRequest.cc b/Utilities/XrdAdaptor/src/XrdRequest.cc
@@ -49,7 +49,7 @@ XrdAdaptor::ClientRequest::HandleResponse(XrdCl::XRootDStatus *stat, XrdCl::AnyO
         edm::LogWarning("XrdAdaptorInternal") << "XrdRequestManager::handle(name='"
           << m_manager.getFilename() << ") failure when reading from "
           << (source ? source->ID() : "(unknown source)")
-          << "; failed with error '" << status->ToString() << "' (errno="
+          << "; failed with error '" << status->ToStr() << "' (errno="
           << status->errNo << ", code=" << status->code << ").";
         m_failure_count++;
         try
@@ -67,7 +67,7 @@ XrdAdaptor::ClientRequest::HandleResponse(XrdCl::XRootDStatus *stat, XrdCl::AnyO
         {
             edm::Exception ex(edm::errors::FileReadError);
             ex << "XrdRequestManager::handle(name='" << m_manager.getFilename()
-               << ") failed with error '" << status->ToString()
+               << ") failed with error '" << status->ToStr()
                << "' (errno=" << status->errNo << ", code="
                << status->code << ").  Unknown exception occurred when running"
                << " connection recovery.";

diff --git a/Utilities/XrdAdaptor/src/XrdSource.cc b/Utilities/XrdAdaptor/src/XrdSource.cc
@@ -48,7 +48,7 @@ Source::~Source()
   XrdCl::XRootDStatus status;
   if (! (status = m_fh->Close()).IsOK())
     edm::LogWarning("XrdFileWarning")
-      << "Source::~Source() failed with error '" << status.ToString()
+      << "Source::~Source() failed with error '" << status.ToStr()
       << "' (errno=" << status.errNo << ", code=" << status.code << ")";
   m_fh.reset();
 }