Changeset 2604 for box/trunk/lib/backupclient/BackupClientFileAttributes.cpp

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.

File:

• box/trunk/lib/backupclient/BackupClientFileAttributes.cpp (modified) (5 diffs)

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;
                 }