svn commit: r211879 - head/sbin/hastd

[Pawel Jakub Dawidek]

Author: pjd
Date: Fri Aug 27 14:08:10 2010
New Revision: 211879
URL: http://svn.freebsd.org/changeset/base/211879

Log:
  Log that synchronization was interrupted in a proper place.
  
  MFC after:	2 weeks
  Obtained from:	Wheel Systems Sp. z o.o. http://www.wheelsystems.com

Modified:
  head/sbin/hastd/primary.c

Modified: head/sbin/hastd/primary.c
==============================================================================
--- head/sbin/hastd/primary.c	Fri Aug 27 14:06:00 2010	(r211878)
+++ head/sbin/hastd/primary.c	Fri Aug 27 14:08:10 2010	(r211879)
@@ -1495,10 +1495,17 @@ sync_thread(void *arg __unused)
 
 	ncomps = HAST_NCOMPONENTS;
 	dorewind = true;
-	synced = 0;
+	synced = -1;
 
 	for (;;) {
 		mtx_lock(&sync_lock);
+		if (synced == -1)
+			synced = 0;
+		else if (!sync_inprogress) {
+			pjdlog_info("Synchronization interrupted. "
+			    "%jd bytes synchronized so far.",
+			    (intmax_t)synced);
+		}
 		while (!sync_inprogress) {
 			dorewind = true;
 			synced = 0;
@@ -1559,10 +1566,6 @@ sync_thread(void *arg __unused)
 				    (uintmax_t)res->hr_secondary_localcnt);
 				(void)metadata_write(res);
 				mtx_unlock(&metadata_lock);
-			} else if (synced > 0) {
-				pjdlog_info("Synchronization interrupted. "
-				    "%jd bytes synchronized so far.",
-				    (intmax_t)synced);
 			}
 			rw_unlock(&hio_remote_lock[ncomp]);
 			continue;