[ARVADOS] updated: b7ff345255551a5187ae7b2846b704a3c800256d

[Git user]

Summary of changes:
 services/keepstore/volume_unix.go      | 157 +++++++++++++++++++++++++--------
 services/keepstore/volume_unix_test.go |  61 +++++++++++++
 2 files changed, 180 insertions(+), 38 deletions(-)

       via  b7ff345255551a5187ae7b2846b704a3c800256d (commit)
       via  4a5f17bc047eea3cc65ccee62315f2215ad5e936 (commit)
       via  837949653b69e357cfa90fb0b8855a37e9c406d7 (commit)
      from  12cf6dc14d6ee5b19ee5ede7dd53a16a75894544 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit b7ff345255551a5187ae7b2846b704a3c800256d
Merge: 12cf6dc 4a5f17b
Author: Tom Clegg <tom at curoverse.com>
Date:   Wed Jan 11 10:24:21 2017 -0500

    Merge branch '10682-localfs-stats'
    
    closes #10682


commit 4a5f17bc047eea3cc65ccee62315f2215ad5e936
Author: Tom Clegg <tom at curoverse.com>
Date:   Wed Jan 11 10:24:14 2017 -0500

    10682: Track readdir ops.

diff --git a/services/keepstore/volume_unix.go b/services/keepstore/volume_unix.go
index 681095d..fa28ee2 100644
--- a/services/keepstore/volume_unix.go
+++ b/services/keepstore/volume_unix.go
@@ -358,6 +358,7 @@ func (v *UnixVolume) IndexTo(prefix string, w io.Writer) error {
 		return err
 	}
 	defer rootdir.Close()
+	v.os.stats.Tick(&v.os.stats.ReaddirOps)
 	for {
 		names, err := rootdir.Readdirnames(1)
 		if err == io.EOF {
@@ -379,6 +380,7 @@ func (v *UnixVolume) IndexTo(prefix string, w io.Writer) error {
 			lastErr = err
 			continue
 		}
+		v.os.stats.Tick(&v.os.stats.ReaddirOps)
 		for {
 			fileInfo, err := blockdir.Readdir(1)
 			if err == io.EOF {
@@ -461,6 +463,7 @@ func (v *UnixVolume) Untrash(loc string) (err error) {
 		return MethodDisabledError
 	}
 
+	v.os.stats.Tick(&v.os.stats.ReaddirOps)
 	files, err := ioutil.ReadDir(v.blockDir(loc))
 	if err != nil {
 		return err

-----------------------------------------------------------------------


hooks/post-receive
--