Mirroristas/etcd
2
0
Fork 0
mirror of https://github.com/etcd-io/etcd.git synced 2024-09-27 06:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #737 from ghodss/fix-dir-ttl-response

Browse Source 
fix(store.go) include node.dir = true when updating a directory's ttl
This commit is contained in:
Yicheng Qin
2014-04-18 11:47:29 -07:00
parent 9f228550a2 3ae0a1e1a6
commit 21693b70f7
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
store/store.go
View File

@@ -432,9 +432,13 @@ func (s *store) Update(nodePath string, newValue string, expireTime time.Time) (
n.Write(newValue, nextIndex)
// copy the value for safety
newValueCopy := ustrings.Clone(newValue)
eNode.Value = &newValueCopy
if n.IsDir() {
eNode.Dir = true
} else {
// copy the value for safety
newValueCopy := ustrings.Clone(newValue)
eNode.Value = &newValueCopy
}
// update ttl
n.UpdateTTL(expireTime)

5
store/store_test.go
View File

@@ -287,8 +287,9 @@ func TestStoreUpdateDirTTL(t *testing.T) {
s.Create("/foo", true, "", false, Permanent)
s.Create("/foo/bar", false, "baz", false, Permanent)
_, err := s.Update("/foo", "", time.Now().Add(500*time.Millisecond))
e, _ := s.Get("/foo/bar", false, false)
e, err := s.Update("/foo", "", time.Now().Add(500*time.Millisecond))
assert.Equal(t, e.Node.Dir, true, "")
e, _ = s.Get("/foo/bar", false, false)
assert.Equal(t, *e.Node.Value, "baz", "")
time.Sleep(600 * time.Millisecond)