[CR] Correctly count KV ops in comments, and some minor cleanups

Author: arielshaqed

pkg/config/defaults.go

@@ -154,11 +154,14 @@ func setDefaults(cfgType string) {
 	// KV with these settings:
 	//
 	//   - Cleanly acquiring ownership performs 1 read operation and 1
-	//     write operation.
+	//     write operation.  Releasing ownership performs another 1 read
+	//     operation and 1 write operation.
 	//
 	//   - While ownership is held, add 2.5 read and 2.5 write operation
-	//     per second, and an additional ~7 read and write operations
-	//     per second per branch operation waiting to acquire ownership.
+	//     per second, an additional ~7 read operations per second per
+	//     branch operation waiting to acquire ownership, and an
+	//     additional write operation per branch operation acquiring
+	//     ownership.
 
 	// See comments on WeakOwner for how to compute these numbers.
 	viper.SetDefault("graveler.branch_ownership.refresh", 400*time.Millisecond)

pkg/kv/util/weak_owner.go

@@ -262,7 +262,6 @@ func (w *WeakOwner) releaseIf(ctx context.Context, owner string, prefixedKey []b
 		log.Info("Lost ownership race before trying to release")
 		return nil
 	}
-	ownership.Owner = fmt.Sprintf("[released] %s", ownership.Owner)
 	// Set expiration to the beginning of time - definitely expired.
 	ownership.Expires.Reset()
 	err = kv.SetMsgIf(ctx, w.Store, weakOwnerPartition, prefixedKey, &ownership, predicate)

pkg/testutil/stress/stats.go

@@ -38,7 +38,7 @@ func (t *TotalStats) String() string {
 	if t.FirstError != nil {
 		ret = fmt.Sprintf("First error: %s\n", t.FirstError)
 	}
-	ret = ret + fmt.Sprintf("%d total with %d failures in %s\n%f successes/s\n%f failures/s",
+	ret += fmt.Sprintf("%d total with %d failures in %s\n%f successes/s\n%f failures/s",
 		t.NumTotal, t.NumErrors, t.Duration,
 		float64(t.NumTotal)/t.Duration.Seconds(),
 		float64(t.NumErrors)/t.Duration.Seconds(),
@@ -63,9 +63,6 @@ type ResultCollector struct {
 	totalCompleted   int64
 	totalErrors      int64
 	currentCompleted int64
-	// startTime is when collection started.  It is roughly equal to the
-	// start of the experiment.
-	startTime time.Time
 }
 
 func (rc *ResultCollector) flushCurrent() *Stats {