Merge "cmd/sb: also dump any syncgroups in the dump command"
diff --git a/services/syncbase/server/nosql/row.go b/services/syncbase/server/nosql/row.go
index 97cfc98..e95746e 100644
--- a/services/syncbase/server/nosql/row.go
+++ b/services/syncbase/server/nosql/row.go
@@ -126,6 +126,8 @@
if err != nil {
return err
}
+ // TODO(rogulenko): Avoid the redundant lookups since in theory we have all
+ // we need from the checkAccess.
permsKey := r.t.prefixPermsKey(permsPrefix)
if err := watchable.PutWithPerms(tx, []byte(r.stKey()), value, permsKey); err != nil {
return verror.New(verror.ErrInternal, ctx, err)
@@ -140,6 +142,8 @@
if err != nil {
return err
}
+ // TODO(rogulenko): Avoid the redundant lookups since in theory we have all
+ // we need from the checkAccess.
permsKey := r.t.prefixPermsKey(permsPrefix)
if err := watchable.DeleteWithPerms(tx, []byte(r.stKey()), permsKey); err != nil {
return verror.New(verror.ErrInternal, ctx, err)
diff --git a/services/syncbase/server/nosql/table.go b/services/syncbase/server/nosql/table.go
index 5850e62..34a9407 100644
--- a/services/syncbase/server/nosql/table.go
+++ b/services/syncbase/server/nosql/table.go
@@ -415,7 +415,7 @@
if err := t.UpdatePrefixPermsIndexForSet(ctx, tx, key); err != nil {
return err
}
- return watchable.PutVOMWithPerms(ctx, tx, t.prefixPermsKey(key), perms, t.prefixPermsKey(parent))
+ return watchable.PutVomWithPerms(ctx, tx, t.prefixPermsKey(key), perms, t.prefixPermsKey(parent))
}
func (t *tableReq) deletePrefixPerms(ctx *context.T, tx store.Transaction, key string) error {
diff --git a/services/syncbase/server/watchable/transaction.go b/services/syncbase/server/watchable/transaction.go
index 49092dd..fdabb29 100644
--- a/services/syncbase/server/watchable/transaction.go
+++ b/services/syncbase/server/watchable/transaction.go
@@ -349,10 +349,10 @@
return nil
}
-// PutWithPerms puts a VOM-encoded value for the managed key, recording the key
-// and version of the prefix permissions object that granted access to this put
-// operation.
-func PutVOMWithPerms(ctx *context.T, tx store.Transaction, k string, v interface{}, permsKey string) error {
+// PutVomWithPerms puts a VOM-encoded value for the managed key, recording
+// the key and the version of the prefix permissions object that granted access
+// to this put operation.
+func PutVomWithPerms(ctx *context.T, tx store.Transaction, k string, v interface{}, permsKey string) error {
bytes, err := vom.Encode(v)
if err != nil {
return verror.New(verror.ErrInternal, ctx, err)
diff --git a/services/syncbase/testutil/util.go b/services/syncbase/testutil/util.go
index 7af6f70..a3a8c72 100644
--- a/services/syncbase/testutil/util.go
+++ b/services/syncbase/testutil/util.go
@@ -249,7 +249,8 @@
name := s.Status().Endpoints[0].Name()
return name, func() {
cancel()
- <-s.Closed()
+ s.Stop()
+ service.Close()
os.RemoveAll(rootDir)
}
}
