From 878d7fc5f5dcde8c7e8730f71cc14c47369b144a Mon Sep 17 00:00:00 2001 From: Philip O'Toole Date: Wed, 19 Aug 2015 12:27:44 -0700 Subject: [PATCH 1/2] Update shard retention time when policy changes Fixes issue #3702. --- meta/data.go | 1 + meta/data_test.go | 2 +- meta/store_test.go | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/meta/data.go b/meta/data.go index 33c829bb8bf..2b9168901fb 100644 --- a/meta/data.go +++ b/meta/data.go @@ -212,6 +212,7 @@ func (data *Data) UpdateRetentionPolicy(database, name string, rpu *RetentionPol } if rpu.Duration != nil { rpi.Duration = *rpu.Duration + rpi.ShardGroupDuration = shardGroupDuration(rpi.Duration) } if rpu.ReplicaN != nil { rpi.ReplicaN = *rpu.ReplicaN diff --git a/meta/data_test.go b/meta/data_test.go index 945d7824250..6e0314c761a 100644 --- a/meta/data_test.go +++ b/meta/data_test.go @@ -178,7 +178,7 @@ func TestData_UpdateRetentionPolicy(t *testing.T) { if rpi, _ := data.RetentionPolicy("db0", "rp1"); !reflect.DeepEqual(rpi, &meta.RetentionPolicyInfo{ Name: "rp1", Duration: 10 * time.Hour, - ShardGroupDuration: 604800000000000, + ShardGroupDuration: 3600000000000, ReplicaN: 3, }) { t.Fatalf("unexpected policy: %#v", rpi) diff --git a/meta/store_test.go b/meta/store_test.go index 6dca9b57c24..ef79306b756 100644 --- a/meta/store_test.go +++ b/meta/store_test.go @@ -361,7 +361,7 @@ func TestStore_UpdateRetentionPolicy(t *testing.T) { } else if !reflect.DeepEqual(rpi, &meta.RetentionPolicyInfo{ Name: "rp1", Duration: 10 * time.Hour, - ShardGroupDuration: 7 * 24 * time.Hour, + ShardGroupDuration: 1 * time.Hour, ReplicaN: 1, }) { t.Fatalf("unexpected policy: %#v", rpi) From 1fe48d80a31e7a78263d4e5068357c30720959c2 Mon Sep 17 00:00:00 2001 From: Philip O'Toole Date: Wed, 19 Aug 2015 12:29:39 -0700 Subject: [PATCH 2/2] Update CHANGELOG --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index c2e7eb01958..7d696d72e95 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -71,6 +71,7 @@ Please see the *Features* section below for full details. - [#3704](https://github.com/influxdb/influxdb/issues/3704): cluster replication issue for measurement name containing backslash - [#3681](https://github.com/influxdb/influxdb/issues/3681): Quoted measurement names fail - [#3681](https://github.com/influxdb/influxdb/issues/3682): Fix inserting string value with backslashes +- [#3736](https://github.com/influxdb/influxdb/pull/3736): Update shard group duration with retention policy changes. Thanks for the report @papylhomme ## v0.9.2 [2015-07-24]