X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/45f10d80d1b584808a6e375214b5be6bc7d2a730..5d843ab702bd516257dda1a872d45755e5170678:/services/datamanager/summary/trash_list.go

diff --git a/services/datamanager/summary/trash_list.go b/services/datamanager/summary/trash_list.go
index 0bedc9cc3a..3e4d387b62 100644
--- a/services/datamanager/summary/trash_list.go
+++ b/services/datamanager/summary/trash_list.go
@@ -1,4 +1,5 @@
 // Code for generating trash lists
+
 package summary
 
 import (
@@ -9,6 +10,7 @@ import (
 	"time"
 )
 
+// BuildTrashLists builds list of blocks to be sent to trash queue
 func BuildTrashLists(kc *keepclient.KeepClient,
 	keepServerInfo *keep.ReadServers,
 	keepBlocksNotInCollections BlockSet) (m map[string]keep.TrashList, err error) {
@@ -27,7 +29,7 @@ func BuildTrashLists(kc *keepclient.KeepClient,
 	ttl := int64(_ttl.(float64))
 
 	// expire unreferenced blocks more than "ttl" seconds old.
-	expiry := time.Now().UTC().Unix() - ttl
+	expiry := time.Now().UTC().UnixNano() - ttl*1e9
 
 	return buildTrashListsInternal(writableServers, keepServerInfo, expiry, keepBlocksNotInCollections), nil
 }
@@ -40,19 +42,19 @@ func buildTrashListsInternal(writableServers map[string]struct{},
 	m = make(map[string]keep.TrashList)
 
 	for block := range keepBlocksNotInCollections {
-		for _, block_on_server := range keepServerInfo.BlockToServers[block] {
-			if block_on_server.Mtime >= expiry {
+		for _, blockOnServer := range keepServerInfo.BlockToServers[block] {
+			if blockOnServer.Mtime >= expiry {
 				continue
 			}
 
 			// block is older than expire cutoff
-			srv := keepServerInfo.KeepServerIndexToAddress[block_on_server.ServerIndex].String()
+			srv := keepServerInfo.KeepServerIndexToAddress[blockOnServer.ServerIndex].String()
 
 			if _, writable := writableServers[srv]; !writable {
 				continue
 			}
 
-			m[srv] = append(m[srv], keep.TrashRequest{Locator: block.Digest.String(), BlockMtime: block_on_server.Mtime})
+			m[srv] = append(m[srv], keep.TrashRequest{Locator: block.Digest.String(), BlockMtime: blockOnServer.Mtime})
 		}
 	}
 	return