Changeset 2604

Timestamp:

10/02/2010 19:01:12 (2 years ago)

Author:

chris

Message:

Log more detailed info about backup comparison failures, for debugging.

Enable -V option in bbackupquery, and document that -q, -v, -V and
-W<level> are allowed in the command-line help.

Location:

box/trunk

Files:

• bin/bbackupquery/bbackupquery.cpp (modified) (5 diffs)
• lib/backupclient/BackupClientFileAttributes.cpp (modified) (5 diffs)
• lib/common/Logging.cpp (modified) (1 diff)
• lib/common/Logging.h (modified) (3 diffs)

box/trunk/bin/bbackupquery/bbackupquery.cpp

@@ -61 +61 @@
 void PrintUsageAndExit()
 {
-        printf("Usage: bbackupquery [-q] [-w] "
+        printf("Usage: bbackupquery [-q*|v*|V|W<level>] [-w] "
 #ifdef WIN32
         "[-u] "
@@ -124 +124 @@
 
 #ifdef WIN32
-        const char* validOpts = "qvwuc:l:o:O:W:";
+        const char* validOpts = "qvVwuc:l:o:O:W:";
         bool unicodeConsole = false;
 #else
-        const char* validOpts = "qvwc:l:o:O:W:";
+        const char* validOpts = "qvVwc:l:o:O:W:";
 #endif
 
@@ -139 +139 @@
                 switch(c)
                 {
-                        case 'q':
+                case 'q':
                         {
                                 if(masterLevel == Log::NOTHING)
@@ -152 +152 @@
                         break;
 
-                        case 'v':
+                case 'v':
                         {
                                 if(masterLevel == Log::EVERYTHING)
@@ -162 +162 @@
                                 }
                                 masterLevel++;
+                        }
+                        break;
+
+                case 'V':
+                        {
+                                masterLevel = Log::EVERYTHING;
                         }
                         break;

box/trunk/lib/backupclient/BackupClientFileAttributes.cpp

@@ -235 +235 @@
         if(mpClearAttributes->GetSize() != rAttr.mpClearAttributes->GetSize())
         {
+                BOX_TRACE("Attribute Compare: Attributes objects are "
+                        "different sizes, cannot compare them: local " <<
+                        mpClearAttributes->GetSize() << " bytes, remote " <<
+                        rAttr.mpClearAttributes->GetSize() << " bytes");
                 return false;
         }
@@ -242 +246 @@
         attr_StreamFormat *a1 = (attr_StreamFormat*)mpClearAttributes->GetBuffer();
         attr_StreamFormat *a2 = (attr_StreamFormat*)rAttr.mpClearAttributes->GetBuffer();
-        
-        if(a1->AttributeType != a2->AttributeType
-                || a1->UID != a2->UID
-                || a1->GID != a2->GID
-                || a1->UserDefinedFlags != a2->UserDefinedFlags
-                || a1->Mode != a2->Mode)
-        {
-                return false;
-        }
+
+        #define COMPARE(attribute, message) \
+        if (a1->attribute != a2->attribute) \
+        { \
+                BOX_TRACE("Attribute Compare: " << message << " differ: " \
+                        "local " << a1->attribute << ", " \
+                        "remote " << a2->attribute); \
+                return false; \
+        }
+        COMPARE(AttributeType, "Attribute types");
+        COMPARE(UID, "UIDs");
+        COMPARE(GID, "GIDs");
+        COMPARE(UserDefinedFlags, "User-defined flags");
+        COMPARE(Mode, "Modes");
         
         if(!IgnoreModTime)
@@ -258 +267 @@
                 if(t1 != t2)
                 {
+                        BOX_TRACE("Attribute Compare: File modification "
+                                "times differ: local " << t1 << ", "
+                                "remote " << t2);
                         return false;
                 }
@@ -268 +280 @@
                 if(t1 != t2)
                 {
+                        BOX_TRACE("Attribute Compare: Attribute modification "
+                                "times differ: local " << t1 << ", "
+                                "remote " << t2);
                         return false;
                 }
@@ -277 +292 @@
         {
                 // Symlink strings don't match. This also compares xattrs
-                if(::memcmp(a1 + 1, a2 + 1, size - sizeof(attr_StreamFormat)) != 0)
-                {
+                int datalen = size - sizeof(attr_StreamFormat);
+
+                if(::memcmp(a1 + 1, a2 + 1, datalen) != 0)
+                {
+                        std::string s1((char *)(a1 + 1), datalen);
+                        std::string s2((char *)(a2 + 1), datalen);
+                        BOX_TRACE("Attribute Compare: Symbolic link target "
+                                "or extended attributes differ: "
+                                "local " << PrintEscapedBinaryData(s1) << ", "
+                                "remote " << PrintEscapedBinaryData(s2));
                         return false;
                 }

box/trunk/lib/common/Logging.cpp

@@ -496 +496 @@
         return true;
 }
+
+std::string PrintEscapedBinaryData(const std::string& rInput)
+{
+        std::ostringstream output;
+
+        for (size_t i = 0; i < rInput.length(); i++)
+        {
+                if (isprint(rInput[i]))
+                {
+                        output << rInput[i];
+                }
+                else
+                {
+                        output << "\\x" << std::hex << std::setw(2) <<
+                                std::setfill('0') << (int) rInput[i] <<
+                                std::dec;
+                }
+        }
+
+        return output.str();
+}

box/trunk/lib/common/Logging.h

@@ -18 +18 @@
 
 #include "FileStream.h"
-
-/*
-#define BOX_LOG(level, stuff) \
-{ \
-    if(Log::sMaxLoggingLevelForAnyOutput >= level) \
-        std::ostringstream line; \
-        line << stuff; \
-        Log::Write(level, __FILE__, __LINE__, line.str()); \
-    } \
-}
-*/
 
 #define BOX_LOG(level, stuff) \
@@ -53 +42 @@
         { BOX_LOG(Log::TRACE, stuff) }
 
+#define BOX_SYS_ERROR(stuff) \
+        stuff << ": " << std::strerror(errno) << " (" << errno << ")"
+
 #define BOX_LOG_SYS_WARNING(stuff) \
-        BOX_WARNING(stuff << ": " << std::strerror(errno) << " (" << errno << ")")
+        BOX_WARNING(BOX_SYS_ERROR(stuff))
 #define BOX_LOG_SYS_ERROR(stuff) \
-        BOX_ERROR(stuff << ": " << std::strerror(errno) << " (" << errno << ")")
+        BOX_ERROR(BOX_SYS_ERROR(stuff))
 #define BOX_LOG_SYS_FATAL(stuff) \
-        BOX_FATAL(stuff << ": " << std::strerror(errno) << " (" << errno << ")")
+        BOX_FATAL(BOX_SYS_ERROR(stuff))
+
+#define LOG_AND_THROW_ERROR(message, filename, exception, subtype) \
+        BOX_LOG_SYS_ERROR(message << ": " << filename); \
+        THROW_EXCEPTION_MESSAGE(exception, subtype, \
+                BOX_SYS_ERROR(message << ": " << filename));
 
 inline std::string GetNativeErrorMessage()
@@ -340 +337 @@
 };
 
+std::string PrintEscapedBinaryData(const std::string& rInput);
+
 #endif // LOGGING__H