From: Tom Clegg <tom@tomclegg.ca>
Date: Wed, 16 Sep 2020 18:02:33 +0000 (-0400)
Subject: 16842: Truncate nanoseconds from timestamps in index response.
X-Git-Tag: 2.1.0~58^2~1
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/f317fc0d8e77ce950b6a650149600b0c8f6c38f3

16842: Truncate nanoseconds from timestamps in index response.

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom@tomclegg.ca>
---

diff --git a/services/keepstore/s3_volume.go b/services/keepstore/s3_volume.go
index 235d369b5a..07bb033c9f 100644
--- a/services/keepstore/s3_volume.go
+++ b/services/keepstore/s3_volume.go
@@ -586,7 +586,10 @@ func (v *S3Volume) IndexTo(prefix string, writer io.Writer) error {
 		if err != nil {
 			return err
 		}
-		fmt.Fprintf(writer, "%s+%d %d\n", data.Key, data.Size, t.UnixNano())
+		// We truncate sub-second precision here. Otherwise
+		// timestamps will never match the RFC1123-formatted
+		// Last-Modified values parsed by Mtime().
+		fmt.Fprintf(writer, "%s+%d %d\n", data.Key, data.Size, t.Unix()*1000000000)
 	}
 	return dataL.Error()
 }