8460: Fix copy-paste errors; use html entity instead of literal utf8 bullet.

[arvados.git] / services / datamanager / summary / trash_list.go

diff --git a/services/datamanager/summary/trash_list.go b/services/datamanager/summary/trash_list.go
index 0bedc9cc3a6cd80854185f99867257e0727448af..3e4d387b62e2c4ba3c7d039a7114bd5ad222d2da 100644 (file)
--- 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