[ARVADOS] created: 1.2.0-253-g15623db9b

[Git user]

        at  15623db9b12d8ac1b0b44a3eb53358896254b28a (commit)


commit 15623db9b12d8ac1b0b44a3eb53358896254b28a
Author: Lucas Di Pentima <ldipentima at veritasgenetics.com>
Date:   Tue Oct 23 19:19:07 2018 -0300

    14299: Use include_old_versions in keep-balance to avoid losing blocks.
    
    Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <ldipentima at veritasgenetics.com>

diff --git a/sdk/go/arvados/resource_list.go b/sdk/go/arvados/resource_list.go
index e4b5f6540..14ce098cf 100644
--- a/sdk/go/arvados/resource_list.go
+++ b/sdk/go/arvados/resource_list.go
@@ -9,14 +9,15 @@ import "encoding/json"
 // ResourceListParams expresses which results are requested in a
 // list/index API.
 type ResourceListParams struct {
-	Select       []string `json:"select,omitempty"`
-	Filters      []Filter `json:"filters,omitempty"`
-	IncludeTrash bool     `json:"include_trash,omitempty"`
-	Limit        *int     `json:"limit,omitempty"`
-	Offset       int      `json:"offset,omitempty"`
-	Order        string   `json:"order,omitempty"`
-	Distinct     bool     `json:"distinct,omitempty"`
-	Count        string   `json:"count,omitempty"`
+	Select             []string `json:"select,omitempty"`
+	Filters            []Filter `json:"filters,omitempty"`
+	IncludeTrash       bool     `json:"include_trash,omitempty"`
+	IncludeOldVersions bool     `json:"include_old_versions,omitempty"`
+	Limit              *int     `json:"limit,omitempty"`
+	Offset             int      `json:"offset,omitempty"`
+	Order              string   `json:"order,omitempty"`
+	Distinct           bool     `json:"distinct,omitempty"`
+	Count              string   `json:"count,omitempty"`
 }
 
 // A Filter restricts the set of records returned by a list/index API.
diff --git a/services/keep-balance/balance_run_test.go b/services/keep-balance/balance_run_test.go
index 923ea47c4..f7cb7f92b 100644
--- a/services/keep-balance/balance_run_test.go
+++ b/services/keep-balance/balance_run_test.go
@@ -17,7 +17,6 @@ import (
 
 	"git.curoverse.com/arvados.git/sdk/go/arvados"
 	"github.com/Sirupsen/logrus"
-
 	check "gopkg.in/check.v1"
 )
 
@@ -424,6 +423,7 @@ func (s *runSuite) TestDryRun(c *check.C) {
 	c.Check(err, check.IsNil)
 	for _, req := range collReqs.reqs {
 		c.Check(req.Form.Get("include_trash"), check.Equals, "true")
+		c.Check(req.Form.Get("include_old_versions"), check.Equals, "true")
 	}
 	c.Check(trashReqs.Count(), check.Equals, 0)
 	c.Check(pullReqs.Count(), check.Equals, 0)
diff --git a/services/keep-balance/collection.go b/services/keep-balance/collection.go
index 8f4ebb6bd..1e5fa5797 100644
--- a/services/keep-balance/collection.go
+++ b/services/keep-balance/collection.go
@@ -36,7 +36,8 @@ func EachCollection(c *arvados.Client, pageSize int, f func(arvados.Collection)
 	}
 
 	expectCount, err := countCollections(c, arvados.ResourceListParams{
-		IncludeTrash: true,
+		IncludeTrash:       true,
+		IncludeOldVersions: true,
 	})
 	if err != nil {
 		return err
@@ -48,11 +49,12 @@ func EachCollection(c *arvados.Client, pageSize int, f func(arvados.Collection)
 		limit = 1<<31 - 1
 	}
 	params := arvados.ResourceListParams{
-		Limit:        &limit,
-		Order:        "modified_at, uuid",
-		Count:        "none",
-		Select:       []string{"uuid", "unsigned_manifest_text", "modified_at", "portable_data_hash", "replication_desired"},
-		IncludeTrash: true,
+		Limit:              &limit,
+		Order:              "modified_at, uuid",
+		Count:              "none",
+		Select:             []string{"uuid", "unsigned_manifest_text", "modified_at", "portable_data_hash", "replication_desired"},
+		IncludeTrash:       true,
+		IncludeOldVersions: true,
 	}
 	var last arvados.Collection
 	var filterTime time.Time
@@ -140,7 +142,8 @@ func EachCollection(c *arvados.Client, pageSize int, f func(arvados.Collection)
 			Attr:     "modified_at",
 			Operator: "<=",
 			Operand:  filterTime}},
-		IncludeTrash: true,
+		IncludeTrash:       true,
+		IncludeOldVersions: true,
 	}); err != nil {
 		return err
 	} else if callCount < checkCount {
diff --git a/services/keep-balance/integration_test.go b/services/keep-balance/integration_test.go
index 5280b40c9..ceffb9cc1 100644
--- a/services/keep-balance/integration_test.go
+++ b/services/keep-balance/integration_test.go
@@ -16,7 +16,6 @@ import (
 	"git.curoverse.com/arvados.git/sdk/go/arvadostest"
 	"git.curoverse.com/arvados.git/sdk/go/keepclient"
 	"github.com/Sirupsen/logrus"
-
 	check "gopkg.in/check.v1"
 )
 

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


hooks/post-receive
--