syncbase/vsync: More logging for debugging conflict resolution.
Change-Id: I0c018f64412544aa9c558187a9590f956feb9e62
diff --git a/services/syncbase/vsync/conflict_resolution.go b/services/syncbase/vsync/conflict_resolution.go
index 3b512ee..b033ad9 100644
--- a/services/syncbase/vsync/conflict_resolution.go
+++ b/services/syncbase/vsync/conflict_resolution.go
@@ -33,21 +33,22 @@
// resolved by adding new versions or picking either the local or the remote
// version.
func (iSt *initiationState) resolveConflicts(ctx *context.T) error {
- vlog.VI(2).Infof("cr: resolveConflicts: start")
- defer vlog.VI(2).Infof("cr: resolveConflicts: end")
+ vlog.VI(2).Infof("sync: resolveConflicts: start")
+ defer vlog.VI(2).Infof("sync: resolveConflicts: end")
// Lookup schema for the database to figure out the CR policy set by the
// application.
schema, err := iSt.getDbSchema(ctx)
if err != nil {
if verror.ErrorID(err) == verror.ErrNoExist.ID {
- vlog.VI(2).Infof("cr: resolveConflicts: no schema found, resolving based on timestamp")
+ vlog.VI(2).Infof("sync: resolveConflicts: no schema found, resolving based on timestamp")
return iSt.resolveViaTimestamp(ctx, iSt.updObjects)
}
vlog.Errorf("sync: resolveConflicts: error while fetching schema: %v", err)
return err
}
- vlog.VI(2).Infof("cr: resolveConflicts: schema found.")
+ vlog.VI(2).Infof("cr: resolveConflicts: schema found: %v", schema)
+
// Categorize conflicts based on CR policy in schema.
conflictsByType := iSt.groupConflictsByType(schema)
diff --git a/services/syncbase/vsync/cr_app_resolves.go b/services/syncbase/vsync/cr_app_resolves.go
index 3d1fd9d..200f161 100644
--- a/services/syncbase/vsync/cr_app_resolves.go
+++ b/services/syncbase/vsync/cr_app_resolves.go
@@ -59,9 +59,9 @@
sendStream := appConn.SendStream()
recvStream := appConn.RecvStream()
- vlog.VI(2).Infof("cr: resolveViaApp: starting app based resolution on %d groups", len(groupedConflicts.groups))
+ vlog.VI(2).Infof("sync: resolveViaApp: starting app based resolution on %d groups", len(groupedConflicts.groups))
for i, group := range groupedConflicts.groups {
- vlog.VI(2).Infof("cr: resolveViaApp: sending conflict group %d to app", i)
+ vlog.VI(2).Infof("sync: resolveViaApp: sending conflict group %d to app", i)
// Send all batches first
if err := sendBatches(ctx, iSt, sendStream, db, group); err != nil {
return err
@@ -88,7 +88,7 @@
return verror.New(verror.ErrInternal, ctx, errStr)
}
}
- vlog.VI(2).Infof("cr: resolveViaApp: all resolutions received")
+ vlog.VI(2).Infof("sync: resolveViaApp: all resolutions received")
// Process resolutions.
conf := iSt.config
diff --git a/services/syncbase/vsync/cr_policy_filter.go b/services/syncbase/vsync/cr_policy_filter.go
index dc85db0..c21021a 100644
--- a/services/syncbase/vsync/cr_policy_filter.go
+++ b/services/syncbase/vsync/cr_policy_filter.go
@@ -33,6 +33,7 @@
groupedConflicts[crType] = crGroup
}
crGroup[oid] = conflictState
+ vlog.VI(5).Infof("sync: groupConflictsByType: found conflict of type %v for oid %v", crType, oid)
}
return groupedConflicts
}
