From c94a12c9a759d8fb4558dd878a6299ca77b35eb1 Mon Sep 17 00:00:00 2001 From: Michael Meffie Date: Mon, 16 Apr 2012 22:29:24 -0400 Subject: [PATCH] bozo: increase salvage instance poll rate Increase the bos client poll rate of the salvager temporary bnode instance status, from every 5 seconds to 1 second. This reduces the minimum time bos salvage takes, from 5 seconds to 1 second, which can add up when doing a large number of volume salvages. Reviewed-on: http://gerrit.openafs.org/7231 Tested-by: BuildBot Reviewed-by: Andrew Deason Reviewed-by: Tom Keiser Reviewed-by: Derrick Brashear (cherry picked from commit 2460e132a9ed63714754745fe24f6f3a5712c81d) Change-Id: Ic86d3f3ed5791f880b41533edcd405a8fec24c0b Reviewed-on: http://gerrit.openafs.org/9476 Tested-by: BuildBot Reviewed-by: Andrew Deason Reviewed-by: Benjamin Kaduk Reviewed-by: Stephan Wiesand --- src/bozo/bos.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/bozo/bos.c b/src/bozo/bos.c index 852e7ac71..f4d8bfaf4 100644 --- a/src/bozo/bos.c +++ b/src/bozo/bos.c @@ -1160,6 +1160,7 @@ DoSalvage(struct rx_connection * aconn, char * aparm1, char * aparm2, char pbuffer[PARMBUFFERSSIZE]; afs_int32 partNumber; char *notifier = NONOTIFIER; + int count; /* if a partition was specified, canonicalize the name, since * the salvager has a stupid partition ID parser */ @@ -1330,13 +1331,15 @@ DoSalvage(struct rx_connection * aconn, char * aparm1, char * aparm2, goto done; } /* now wait for bnode to disappear */ + count = 0; while (1) { - IOMGR_Sleep(5); + IOMGR_Sleep(1); tp = tbuffer; code = BOZO_GetInstanceInfo(aconn, "salvage-tmp", &tp, &istatus); if (code) break; - printf("bos: waiting for salvage to complete.\n"); + if ((count++ % 5) == 0) + printf("bos: waiting for salvage to complete.\n"); } if (code != BZNOENT) { printf("bos: salvage failed (%s)\n", em(code)); -- 2.39.5