x/ref: Merge naming.{VDL,}{MountEntry,MountedServer,Glob}.
This fixes the following bug:
https://github.com/veyron/release-issues/issues/1074
MultiPart: 2/4
Change-Id: I60db2ed17d3978a6699e0e8556e4499b7e6258e8
diff --git a/cmd/debug/impl.go b/cmd/debug/impl.go
index 40c4498..03f0d33 100644
--- a/cmd/debug/impl.go
+++ b/cmd/debug/impl.go
@@ -164,7 +164,7 @@
case *naming.MountEntry:
fmt.Fprint(cmd.Stdout(), v.Name)
for _, s := range v.Servers {
- fmt.Fprintf(cmd.Stdout(), " %s (Expires %s)", s.Server, s.Expires)
+ fmt.Fprintf(cmd.Stdout(), " %s (Deadline %s)", s.Server, s.Deadline.Time)
}
fmt.Fprintln(cmd.Stdout())
case *naming.GlobError:
diff --git a/cmd/mounttable/impl.go b/cmd/mounttable/impl.go
index 15b161a..eb1e50d 100644
--- a/cmd/mounttable/impl.go
+++ b/cmd/mounttable/impl.go
@@ -50,15 +50,15 @@
return err
}
for {
- var gr naming.VDLGlobReply
+ var gr naming.GlobReply
if err := call.Recv(&gr); err != nil {
break
}
switch v := gr.(type) {
- case naming.VDLGlobReplyEntry:
+ case naming.GlobReplyEntry:
fmt.Fprint(cmd.Stdout(), v.Value.Name)
for _, s := range v.Value.Servers {
- fmt.Fprintf(cmd.Stdout(), " %s (TTL %s)", s.Server, time.Duration(s.TTL)*time.Second)
+ fmt.Fprintf(cmd.Stdout(), " %s (Deadline %s)", s.Server, s.Deadline.Time)
}
fmt.Fprintln(cmd.Stdout())
}
@@ -206,11 +206,11 @@
if err != nil {
return err
}
- var entry naming.VDLMountEntry
+ var entry naming.MountEntry
if err := call.Finish(&entry); err != nil {
return err
}
- fmt.Fprintf(cmd.Stdout(), "Servers: %v Suffix: %q MT: %v\n", entry.Servers, entry.Name, entry.MT)
+ fmt.Fprintf(cmd.Stdout(), "Servers: %v Suffix: %q MT: %v\n", entry.Servers, entry.Name, entry.ServesMountTable)
return nil
}
diff --git a/cmd/mounttable/impl_test.go b/cmd/mounttable/impl_test.go
index b3d7353..972eaf6 100644
--- a/cmd/mounttable/impl_test.go
+++ b/cmd/mounttable/impl_test.go
@@ -2,8 +2,10 @@
import (
"bytes"
+ "regexp"
"strings"
"testing"
+ "time"
"v.io/v23"
"v.io/v23/context"
@@ -12,21 +14,29 @@
"v.io/v23/security"
"v.io/v23/services/mounttable"
"v.io/v23/services/security/access"
+ vdltime "v.io/v23/vdlroot/time"
"v.io/x/lib/vlog"
_ "v.io/x/ref/profiles"
"v.io/x/ref/test"
)
+var (
+ now = time.Now()
+ deadline1 = vdltime.Deadline{now.Add(time.Minute * 1)}
+ deadline2 = vdltime.Deadline{now.Add(time.Minute * 2)}
+ deadline3 = vdltime.Deadline{now.Add(time.Minute * 3)}
+)
+
type server struct {
suffix string
}
-func (s *server) Glob__(call ipc.ServerCall, pattern string) (<-chan naming.VDLGlobReply, error) {
+func (s *server) Glob__(call ipc.ServerCall, pattern string) (<-chan naming.GlobReply, error) {
vlog.VI(2).Infof("Glob() was called. suffix=%v pattern=%q", s.suffix, pattern)
- ch := make(chan naming.VDLGlobReply, 2)
- ch <- naming.VDLGlobReplyEntry{naming.VDLMountEntry{"name1", []naming.VDLMountedServer{{"server1", nil, 123}}, false}}
- ch <- naming.VDLGlobReplyEntry{naming.VDLMountEntry{"name2", []naming.VDLMountedServer{{"server2", nil, 456}, {"server3", nil, 789}}, false}}
+ ch := make(chan naming.GlobReply, 2)
+ ch <- naming.GlobReplyEntry{naming.MountEntry{"name1", []naming.MountedServer{{"server1", nil, deadline1}}, false}}
+ ch <- naming.GlobReplyEntry{naming.MountEntry{"name2", []naming.MountedServer{{"server2", nil, deadline2}, {"server3", nil, deadline3}}, false}}
close(ch)
return ch, nil
}
@@ -46,16 +56,16 @@
return nil
}
-func (s *server) ResolveStep(ipc.ServerCall) (entry naming.VDLMountEntry, err error) {
+func (s *server) ResolveStep(ipc.ServerCall) (entry naming.MountEntry, err error) {
vlog.VI(2).Infof("ResolveStep() was called. suffix=%v", s.suffix)
- entry.Servers = []naming.VDLMountedServer{{"server1", nil, 123}}
+ entry.Servers = []naming.MountedServer{{"server1", nil, deadline1}}
entry.Name = s.suffix
return
}
-func (s *server) ResolveStepX(ipc.ServerCall) (entry naming.VDLMountEntry, err error) {
+func (s *server) ResolveStepX(ipc.ServerCall) (entry naming.MountEntry, err error) {
vlog.VI(2).Infof("ResolveStepX() was called. suffix=%v", s.suffix)
- entry.Servers = []naming.VDLMountedServer{{"server1", nil, 123}}
+ entry.Servers = []naming.MountedServer{{"server1", nil, deadline1}}
entry.Name = s.suffix
return
}
@@ -125,8 +135,9 @@
if err := cmd.Execute([]string{"glob", naming.JoinAddressName(endpoint.String(), ""), "*"}); err != nil {
t.Fatalf("%v", err)
}
- if expected, got := "name1 server1 (TTL 2m3s)\nname2 server2 (TTL 7m36s) server3 (TTL 13m9s)", strings.TrimSpace(stdout.String()); got != expected {
- t.Errorf("Got %q, expected %q", got, expected)
+ const deadRE = `\(Deadline ([^)]+)\)`
+ if got, wantRE := strings.TrimSpace(stdout.String()), regexp.MustCompile("name1 server1 "+deadRE+"\nname2 server2 "+deadRE+" server3 "+deadRE); !wantRE.MatchString(got) {
+ t.Errorf("got %q, want regexp %q", got, wantRE)
}
stdout.Reset()
@@ -134,8 +145,8 @@
if err := cmd.Execute([]string{"mount", "server", naming.JoinAddressName(endpoint.String(), ""), "123s"}); err != nil {
t.Fatalf("%v", err)
}
- if expected, got := "Name mounted successfully.", strings.TrimSpace(stdout.String()); got != expected {
- t.Errorf("Got %q, expected %q", got, expected)
+ if got, want := strings.TrimSpace(stdout.String()), "Name mounted successfully."; got != want {
+ t.Errorf("got %q, want %q", got, want)
}
stdout.Reset()
@@ -143,8 +154,8 @@
if err := cmd.Execute([]string{"unmount", "server", naming.JoinAddressName(endpoint.String(), "")}); err != nil {
t.Fatalf("%v", err)
}
- if expected, got := "Unmount successful or name not mounted.", strings.TrimSpace(stdout.String()); got != expected {
- t.Errorf("Got %q, expected %q", got, expected)
+ if got, want := strings.TrimSpace(stdout.String()), "Unmount successful or name not mounted."; got != want {
+ t.Errorf("got %q, want %q", got, want)
}
stdout.Reset()
@@ -153,8 +164,8 @@
if err := cmd.Execute([]string{"resolvestep", naming.JoinAddressName(endpoint.String(), "name")}); err != nil {
t.Fatalf("%v", err)
}
- if expected, got := `Servers: [{server1 [] 123}] Suffix: "name" MT: false`, strings.TrimSpace(stdout.String()); got != expected {
- t.Errorf("Got %q, expected %q", got, expected)
+ if got, wantRE := strings.TrimSpace(stdout.String()), regexp.MustCompile(`Servers: \[\{server1 \[\] [^}]+\}\] Suffix: "name" MT: false`); !wantRE.MatchString(got) {
+ t.Errorf("got %q, want regexp %q", got, wantRE)
}
stdout.Reset()
}
diff --git a/cmd/namespace/impl.go b/cmd/namespace/impl.go
index dfbd410..cf8e458 100644
--- a/cmd/namespace/impl.go
+++ b/cmd/namespace/impl.go
@@ -54,7 +54,7 @@
case *naming.MountEntry:
fmt.Fprint(cmd.Stdout(), v.Name)
for _, s := range v.Servers {
- fmt.Fprintf(cmd.Stdout(), " %s (Expires %s)", security.JoinPatternName(fmtBlessingPatterns(s.BlessingPatterns), s.Server), s.Expires)
+ fmt.Fprintf(cmd.Stdout(), " %s (Deadline %s)", security.JoinPatternName(fmtBlessingPatterns(s.BlessingPatterns), s.Server), s.Deadline.Time)
}
fmt.Fprintln(cmd.Stdout())
case *naming.GlobError:
diff --git a/examples/tunnel/tunneld/tunneld_v23_test.go b/examples/tunnel/tunneld/tunneld_v23_test.go
index b5e6d49..55f03a1 100644
--- a/examples/tunnel/tunneld/tunneld_v23_test.go
+++ b/examples/tunnel/tunneld/tunneld_v23_test.go
@@ -65,8 +65,8 @@
// Expect two entries: one for the tunnel hostname and one for its hwaddr.
matches := inv.ExpectSetEventuallyRE(
- "tunnel/hostname/"+regexp.QuoteMeta(hostname)+" (.*) \\(TTL .*\\)",
- "tunnel/hwaddr/.* (.*) \\(TTL .*\\)")
+ "tunnel/hostname/"+regexp.QuoteMeta(hostname)+" (.*) \\(Deadline .*\\)",
+ "tunnel/hwaddr/.* (.*) \\(Deadline .*\\)")
// The full endpoint should be the one we saw originally.
if got, want := matches[0][1], tunnelEndpoint; "/"+got != want {
diff --git a/profiles/internal/ipc/benchmark/glob/glob_test.go b/profiles/internal/ipc/benchmark/glob/glob_test.go
index ed82ae4..6a7ee80 100644
--- a/profiles/internal/ipc/benchmark/glob/glob_test.go
+++ b/profiles/internal/ipc/benchmark/glob/glob_test.go
@@ -98,15 +98,15 @@
bufferSize int
}
-func (o *globObject) Glob__(call ipc.ServerCall, pattern string) (<-chan naming.VDLGlobReply, error) {
+func (o *globObject) Glob__(call ipc.ServerCall, pattern string) (<-chan naming.GlobReply, error) {
if pattern != "*" {
panic("this benchmark only works with pattern='*'")
}
- ch := make(chan naming.VDLGlobReply, o.bufferSize)
+ ch := make(chan naming.GlobReply, o.bufferSize)
go func() {
for i := 0; i < o.b.N; i++ {
name := fmt.Sprintf("%09d", i)
- ch <- naming.VDLGlobReplyEntry{naming.VDLMountEntry{Name: name}}
+ ch <- naming.GlobReplyEntry{naming.MountEntry{Name: name}}
}
close(ch)
}()
@@ -138,7 +138,7 @@
if err != nil {
return 0, err
}
- var me naming.VDLMountEntry
+ var me naming.MountEntry
b.ResetTimer()
count := 0
for {
diff --git a/profiles/internal/ipc/debug_test.go b/profiles/internal/ipc/debug_test.go
index d7aedb6..9a41c67 100644
--- a/profiles/internal/ipc/debug_test.go
+++ b/profiles/internal/ipc/debug_test.go
@@ -104,7 +104,7 @@
}
results := []string{}
for {
- var gr naming.VDLGlobReply
+ var gr naming.GlobReply
if err := call.Recv(&gr); err != nil {
if err != io.EOF {
t.Fatalf("Recv failed for %q: %v. Results received thus far: %q", tc.name, err, results)
@@ -112,7 +112,7 @@
break
}
switch v := gr.(type) {
- case naming.VDLGlobReplyEntry:
+ case naming.GlobReplyEntry:
results = append(results, v.Value.Name)
}
}
diff --git a/profiles/internal/ipc/reserved.go b/profiles/internal/ipc/reserved.go
index 34579fa..5bffce4 100644
--- a/profiles/internal/ipc/reserved.go
+++ b/profiles/internal/ipc/reserved.go
@@ -227,7 +227,7 @@
call.M.Suffix = naming.Join(i.receiver, state.name)
if state.depth > maxRecursiveGlobDepth {
vlog.Errorf("ipc Glob: exceeded recursion limit (%d): %q", maxRecursiveGlobDepth, call.Suffix())
- call.Send(naming.VDLGlobReplyError{
+ call.Send(naming.GlobReplyError{
naming.GlobError{Name: state.name, Error: reserved.NewErrGlobMaxRecursionReached(call.Context())},
})
continue
@@ -235,14 +235,14 @@
obj, auth, err := disp.Lookup(call.Suffix())
if err != nil {
vlog.VI(3).Infof("ipc Glob: Lookup failed for %q: %v", call.Suffix(), err)
- call.Send(naming.VDLGlobReplyError{
+ call.Send(naming.GlobReplyError{
naming.GlobError{Name: state.name, Error: verror.Convert(verror.ErrNoExist, call.Context(), err)},
})
continue
}
if obj == nil {
vlog.VI(3).Infof("ipc Glob: object not found for %q", call.Suffix())
- call.Send(naming.VDLGlobReplyError{
+ call.Send(naming.GlobReplyError{
naming.GlobError{Name: state.name, Error: verror.New(verror.ErrNoExist, call.Context(), "nil object")},
})
continue
@@ -260,7 +260,7 @@
invoker, err := objectToInvoker(obj)
if err != nil {
vlog.VI(3).Infof("ipc Glob: object for %q cannot be converted to invoker: %v", call.Suffix(), err)
- call.Send(naming.VDLGlobReplyError{
+ call.Send(naming.GlobReplyError{
naming.GlobError{Name: state.name, Error: verror.Convert(verror.ErrInternal, call.Context(), err)},
})
continue
@@ -268,9 +268,9 @@
gs := invoker.Globber()
if gs == nil || (gs.AllGlobber == nil && gs.ChildrenGlobber == nil) {
if state.glob.Len() == 0 {
- call.Send(naming.VDLGlobReplyEntry{naming.VDLMountEntry{Name: state.name}})
+ call.Send(naming.GlobReplyEntry{naming.MountEntry{Name: state.name}})
} else {
- call.Send(naming.VDLGlobReplyError{
+ call.Send(naming.GlobReplyError{
naming.GlobError{Name: state.name, Error: reserved.NewErrGlobNotImplemented(call.Context())},
})
}
@@ -281,7 +281,7 @@
ch, err := gs.AllGlobber.Glob__(call, state.glob.String())
if err != nil {
vlog.VI(3).Infof("ipc Glob: %q.Glob(%q) failed: %v", call.Suffix(), state.glob, err)
- call.Send(naming.VDLGlobReplyError{naming.GlobError{Name: state.name, Error: verror.Convert(verror.ErrInternal, call.Context(), err)}})
+ call.Send(naming.GlobReplyError{naming.GlobError{Name: state.name, Error: verror.Convert(verror.ErrInternal, call.Context(), err)}})
continue
}
if ch == nil {
@@ -289,10 +289,10 @@
}
for gr := range ch {
switch v := gr.(type) {
- case naming.VDLGlobReplyEntry:
+ case naming.GlobReplyEntry:
v.Value.Name = naming.Join(state.name, v.Value.Name)
call.Send(v)
- case naming.VDLGlobReplyError:
+ case naming.GlobReplyError:
v.Value.Name = naming.Join(state.name, v.Value.Name)
call.Send(v)
}
@@ -303,12 +303,12 @@
children, err := gs.ChildrenGlobber.GlobChildren__(call)
// The requested object doesn't exist.
if err != nil {
- call.Send(naming.VDLGlobReplyError{naming.GlobError{Name: state.name, Error: verror.Convert(verror.ErrInternal, call.Context(), err)}})
+ call.Send(naming.GlobReplyError{naming.GlobError{Name: state.name, Error: verror.Convert(verror.ErrInternal, call.Context(), err)}})
continue
}
// The glob pattern matches the current object.
if state.glob.Len() == 0 {
- call.Send(naming.VDLGlobReplyEntry{naming.VDLMountEntry{Name: state.name}})
+ call.Send(naming.GlobReplyEntry{naming.MountEntry{Name: state.name}})
}
// The current object has no children.
if children == nil {
@@ -331,7 +331,7 @@
}
}
if someMatchesOmitted {
- call.Send(naming.VDLGlobReplyError{naming.GlobError{Error: reserved.NewErrGlobMatchesOmitted(call.Context())}})
+ call.Send(naming.GlobReplyError{naming.GlobError{Error: reserved.NewErrGlobMatchesOmitted(call.Context())}})
}
return nil
}
diff --git a/profiles/internal/ipc/test/glob_test.go b/profiles/internal/ipc/test/glob_test.go
index 239ee70..0b15216 100644
--- a/profiles/internal/ipc/test/glob_test.go
+++ b/profiles/internal/ipc/test/glob_test.go
@@ -296,7 +296,7 @@
suffix []string
}
-func (o *globObject) Glob__(call ipc.ServerCall, pattern string) (<-chan naming.VDLGlobReply, error) {
+func (o *globObject) Glob__(call ipc.ServerCall, pattern string) (<-chan naming.GlobReply, error) {
g, err := glob.Parse(pattern)
if err != nil {
return nil, err
@@ -305,7 +305,7 @@
if n == nil {
return nil, verror.New(verror.ErrNoExist, call.Context(), o.suffix)
}
- ch := make(chan naming.VDLGlobReply)
+ ch := make(chan naming.GlobReply)
go func() {
o.globLoop(ch, "", g, n)
close(ch)
@@ -313,9 +313,9 @@
return ch, nil
}
-func (o *globObject) globLoop(ch chan<- naming.VDLGlobReply, name string, g *glob.Glob, n *node) {
+func (o *globObject) globLoop(ch chan<- naming.GlobReply, name string, g *glob.Glob, n *node) {
if g.Len() == 0 {
- ch <- naming.VDLGlobReplyEntry{naming.VDLMountEntry{Name: name}}
+ ch <- naming.GlobReplyEntry{naming.MountEntry{Name: name}}
}
if g.Finished() {
return
diff --git a/profiles/internal/naming/namespace/all_test.go b/profiles/internal/naming/namespace/all_test.go
index 57fd5c7..233bde1 100644
--- a/profiles/internal/naming/namespace/all_test.go
+++ b/profiles/internal/naming/namespace/all_test.go
@@ -470,7 +470,7 @@
mu sync.Mutex
}
-func (g *GlobbableServer) Glob__(ipc.ServerCall, string) (<-chan naming.VDLGlobReply, error) {
+func (g *GlobbableServer) Glob__(ipc.ServerCall, string) (<-chan naming.GlobReply, error) {
g.mu.Lock()
defer g.mu.Unlock()
g.callCount++
diff --git a/profiles/internal/naming/namespace/cache.go b/profiles/internal/naming/namespace/cache.go
index 15cbd7f..97afb3a 100644
--- a/profiles/internal/naming/namespace/cache.go
+++ b/profiles/internal/naming/namespace/cache.go
@@ -38,7 +38,7 @@
func isStale(now time.Time, e naming.MountEntry) bool {
for _, s := range e.Servers {
- if s.Expires.Before(now) {
+ if s.Deadline.Before(now) {
return true
}
}
@@ -88,7 +88,7 @@
for _, s := range entry.Servers {
ce.Servers = append(ce.Servers, s)
}
- ce.SetServesMountTable(entry.ServesMountTable())
+ ce.ServesMountTable = entry.ServesMountTable
c.Lock()
// Enforce an upper limit on the cache size.
if len(c.entries) >= maxCacheEntries {
diff --git a/profiles/internal/naming/namespace/cache_test.go b/profiles/internal/naming/namespace/cache_test.go
index 7534854..305bbd6 100644
--- a/profiles/internal/naming/namespace/cache_test.go
+++ b/profiles/internal/naming/namespace/cache_test.go
@@ -6,6 +6,7 @@
"time"
"v.io/v23/naming"
+ vdltime "v.io/v23/vdlroot/time"
)
func compatible(server string, servers []naming.MountedServer) bool {
@@ -15,8 +16,8 @@
return servers[0].Server == server
}
-func future(secs uint32) time.Time {
- return time.Now().Add(time.Duration(secs) * time.Second)
+func future(secs uint32) vdltime.Deadline {
+ return vdltime.Deadline{time.Now().Add(time.Duration(secs) * time.Second)}
}
// TestCache tests the cache directly rather than via the namespace methods.
@@ -32,7 +33,7 @@
}
c := newTTLCache()
for _, p := range preload {
- e := &naming.MountEntry{Name: p.suffix, Servers: []naming.MountedServer{naming.MountedServer{Server: p.server, Expires: future(30)}}}
+ e := &naming.MountEntry{Name: p.suffix, Servers: []naming.MountedServer{{Server: p.server, Deadline: future(30)}}}
c.remember(p.name, e)
}
@@ -62,7 +63,7 @@
func TestCacheLimit(t *testing.T) {
c := newTTLCache().(*ttlCache)
- e := &naming.MountEntry{Servers: []naming.MountedServer{naming.MountedServer{Server: "the rain in spain", Expires: future(3000)}}}
+ e := &naming.MountEntry{Servers: []naming.MountedServer{naming.MountedServer{Server: "the rain in spain", Deadline: future(3000)}}}
for i := 0; i < maxCacheEntries; i++ {
c.remember(fmt.Sprintf("%d", i), e)
if len(c.entries) > maxCacheEntries {
@@ -77,17 +78,17 @@
}
func TestCacheTTL(t *testing.T) {
- before := time.Now()
+ before := vdltime.Deadline{time.Now()}
c := newTTLCache().(*ttlCache)
// Fill cache.
- e := &naming.MountEntry{Servers: []naming.MountedServer{naming.MountedServer{Server: "the rain in spain", Expires: future(3000)}}}
+ e := &naming.MountEntry{Servers: []naming.MountedServer{naming.MountedServer{Server: "the rain in spain", Deadline: future(3000)}}}
for i := 0; i < maxCacheEntries; i++ {
c.remember(fmt.Sprintf("%d", i), e)
}
// Time out half the entries.
i := len(c.entries) / 2
for k := range c.entries {
- c.entries[k].Servers[0].Expires = before
+ c.entries[k].Servers[0].Deadline = before
if i == 0 {
break
}
@@ -112,7 +113,7 @@
ns, _ := New()
c := ns.resolutionCache.(*ttlCache)
for _, p := range preload {
- e := &naming.MountEntry{Servers: []naming.MountedServer{naming.MountedServer{Server: "p.server", Expires: future(3000)}}}
+ e := &naming.MountEntry{Servers: []naming.MountedServer{naming.MountedServer{Server: "p.server", Deadline: future(3000)}}}
c.remember(p.name, e)
}
toflush := "/h1/xyzzy"
@@ -158,7 +159,7 @@
name := "/h1//a"
serverName := "/h2//"
c := ns.resolutionCache.(*ttlCache)
- e := &naming.MountEntry{Servers: []naming.MountedServer{naming.MountedServer{Server: serverName, Expires: future(3000)}}}
+ e := &naming.MountEntry{Servers: []naming.MountedServer{naming.MountedServer{Server: serverName, Deadline: future(3000)}}}
c.remember(name, e)
if ne, err := c.lookup(name); err != nil || ne.Servers[0].Server != serverName {
t.Errorf("should have found the server in the cache")
diff --git a/profiles/internal/naming/namespace/glob.go b/profiles/internal/naming/namespace/glob.go
index cdb70ef..82cc8bd 100644
--- a/profiles/internal/naming/namespace/glob.go
+++ b/profiles/internal/naming/namespace/glob.go
@@ -60,7 +60,7 @@
for {
// If the mount table returns an error, we're done. Send the task to the channel
// including the error. This terminates the task.
- var gr naming.VDLGlobReply
+ var gr naming.GlobReply
err := call.Recv(&gr)
if err == io.EOF {
break
@@ -72,18 +72,18 @@
var x *task
switch v := gr.(type) {
- case naming.VDLGlobReplyEntry:
+ case naming.GlobReplyEntry:
// Convert to the ever so slightly different name.MountTable version of a MountEntry
// and add it to the list.
x = &task{
me: &naming.MountEntry{
- Name: naming.Join(t.me.Name, v.Value.Name),
- Servers: convertServers(v.Value.Servers),
+ Name: naming.Join(t.me.Name, v.Value.Name),
+ Servers: v.Value.Servers,
+ ServesMountTable: v.Value.ServesMountTable,
},
depth: t.depth + 1,
}
- x.me.SetServesMountTable(v.Value.MT)
- case naming.VDLGlobReplyError:
+ case naming.GlobReplyError:
// Pass on the error.
x = &task{
er: &v.Value,
@@ -184,13 +184,13 @@
// query on since we know the server will not supply a new address for the
// current name.
if suffix.Finished() {
- if !t.me.ServesMountTable() {
+ if !t.me.ServesMountTable {
continue
}
}
// If this is restricted recursive and not a mount table, don't descend into it.
- if suffix.Restricted() && suffix.Len() == 0 && !t.me.ServesMountTable() {
+ if suffix.Restricted() && suffix.Len() == 0 && !t.me.ServesMountTable {
continue
}
diff --git a/profiles/internal/naming/namespace/namespace.go b/profiles/internal/naming/namespace/namespace.go
index acf146d..d2cc167 100644
--- a/profiles/internal/naming/namespace/namespace.go
+++ b/profiles/internal/naming/namespace/namespace.go
@@ -8,6 +8,7 @@
"v.io/v23/naming"
"v.io/v23/security"
+ vdltime "v.io/v23/vdlroot/time"
"v.io/v23/verror"
"v.io/x/lib/vlog"
)
@@ -128,16 +129,16 @@
objPattern, name := security.SplitPatternName(name)
mtPattern := getRootPattern(opts)
e := new(naming.MountEntry)
- expiration := time.Now().Add(time.Hour) // plenty of time for a call
+ deadline := vdltime.Deadline{time.Now().Add(time.Hour)} // plenty of time for a call
address, suffix := naming.SplitAddressName(name)
if len(address) == 0 {
- e.SetServesMountTable(true)
+ e.ServesMountTable = true
e.Name = name
ns.RLock()
defer ns.RUnlock()
for _, r := range ns.roots {
// TODO(ashankar): Configured namespace roots should also include the pattern?
- server := naming.MountedServer{Server: r, Expires: expiration}
+ server := naming.MountedServer{Server: r, Deadline: deadline}
if len(mtPattern) > 0 {
server.BlessingPatterns = []string{mtPattern}
}
@@ -149,9 +150,9 @@
if ep, err := inaming.NewEndpoint(address); err == nil {
servesMT = ep.ServesMountTable()
}
- e.SetServesMountTable(servesMT)
+ e.ServesMountTable = servesMT
e.Name = suffix
- server := naming.MountedServer{Server: naming.JoinAddressName(address, ""), Expires: expiration}
+ server := naming.MountedServer{Server: naming.JoinAddressName(address, ""), Deadline: deadline}
if servesMT && len(mtPattern) > 0 {
server.BlessingPatterns = []string{string(mtPattern)}
}
diff --git a/profiles/internal/naming/namespace/resolve.go b/profiles/internal/naming/namespace/resolve.go
index 2b93d2a..981f08f 100644
--- a/profiles/internal/naming/namespace/resolve.go
+++ b/profiles/internal/naming/namespace/resolve.go
@@ -37,8 +37,8 @@
vlog.VI(2).Infof("ResolveStep.StartCall %s failed: %s", name, err)
continue
}
- var entry naming.VDLMountEntry
- if err := call.Finish(&entry); err != nil {
+ entry := new(naming.MountEntry)
+ if err := call.Finish(entry); err != nil {
// If any replica says the name doesn't exist, return that fact.
if verror.Is(err, naming.ErrNoSuchName.ID) || verror.Is(err, naming.ErrNoSuchNameRoot.ID) {
return nil, err
@@ -49,10 +49,9 @@
continue
}
// Add result to cache.
- ne := convertMountEntry(&entry)
- ns.resolutionCache.remember(name, ne)
- vlog.VI(2).Infof("resolveAMT %s -> %v", name, *ne)
- return ne, nil
+ ns.resolutionCache.remember(name, entry)
+ vlog.VI(2).Infof("resolveAMT %s -> %v", name, entry)
+ return entry, nil
}
return nil, finalErr
}
@@ -83,7 +82,7 @@
// Iterate walking through mount table servers.
for remaining := ns.maxResolveDepth; remaining > 0; remaining-- {
vlog.VI(2).Infof("Resolve(%s) loop %v", name, *e)
- if !e.ServesMountTable() || terminal(e) {
+ if !e.ServesMountTable || terminal(e) {
setBlessingPatterns(e, objPattern)
vlog.VI(1).Infof("Resolve(%s) -> %v", name, *e)
return e, nil
@@ -128,7 +127,7 @@
var err error
curr := e
// If the next name to resolve doesn't point to a mount table, we're done.
- if !e.ServesMountTable() || terminal(e) {
+ if !e.ServesMountTable || terminal(e) {
vlog.VI(1).Infof("ResolveToMountTable(%s) -> %v", name, last)
return last, nil
}
diff --git a/profiles/internal/naming/namespace/stub.go b/profiles/internal/naming/namespace/stub.go
index 50b4f09..aae7b77 100644
--- a/profiles/internal/naming/namespace/stub.go
+++ b/profiles/internal/naming/namespace/stub.go
@@ -1,10 +1,6 @@
package namespace
-import (
- "time"
-
- "v.io/v23/naming"
-)
+import "v.io/v23/naming"
func convertServersToStrings(servers []naming.MountedServer, suffix string) (ret []string) {
for _, s := range servers {
@@ -19,21 +15,3 @@
}
return
}
-
-func convertServers(servers []naming.VDLMountedServer) []naming.MountedServer {
- var reply []naming.MountedServer
- for _, s := range servers {
- if s.TTL == 0 {
- s.TTL = 32000000 // > 1 year
- }
- expires := time.Now().Add(time.Duration(s.TTL) * time.Second)
- reply = append(reply, naming.MountedServer{Server: s.Server, BlessingPatterns: s.BlessingPatterns, Expires: expires})
- }
- return reply
-}
-
-func convertMountEntry(e *naming.VDLMountEntry) *naming.MountEntry {
- v := &naming.MountEntry{Name: e.Name, Servers: convertServers(e.Servers)}
- v.SetServesMountTable(e.MT)
- return v
-}
diff --git a/services/mgmt/device/impl/proxy_invoker.go b/services/mgmt/device/impl/proxy_invoker.go
index 8f252a7..8399efa 100644
--- a/services/mgmt/device/impl/proxy_invoker.go
+++ b/services/mgmt/device/impl/proxy_invoker.go
@@ -215,7 +215,7 @@
type call struct {
ipc.ServerCall
- ch chan<- naming.VDLGlobReply
+ ch chan<- naming.GlobReply
}
func (c *call) Recv(v interface{}) error {
@@ -223,12 +223,12 @@
}
func (c *call) Send(v interface{}) error {
- c.ch <- v.(naming.VDLGlobReply)
+ c.ch <- v.(naming.GlobReply)
return nil
}
-func (p *proxyInvoker) Glob__(serverCall ipc.ServerCall, pattern string) (<-chan naming.VDLGlobReply, error) {
- ch := make(chan naming.VDLGlobReply)
+func (p *proxyInvoker) Glob__(serverCall ipc.ServerCall, pattern string) (<-chan naming.GlobReply, error) {
+ ch := make(chan naming.GlobReply)
go func() {
p.Invoke(ipc.GlobMethod, &call{serverCall, ch}, []interface{}{&pattern})
close(ch)
diff --git a/services/mgmt/stats/impl/stats.go b/services/mgmt/stats/impl/stats.go
index 32abd7c..779a88f 100644
--- a/services/mgmt/stats/impl/stats.go
+++ b/services/mgmt/stats/impl/stats.go
@@ -36,15 +36,15 @@
}
// Glob__ returns the name of all objects that match pattern.
-func (i *statsService) Glob__(call ipc.ServerCall, pattern string) (<-chan naming.VDLGlobReply, error) {
+func (i *statsService) Glob__(call ipc.ServerCall, pattern string) (<-chan naming.GlobReply, error) {
vlog.VI(1).Infof("%v.Glob__(%q)", i.suffix, pattern)
- ch := make(chan naming.VDLGlobReply)
+ ch := make(chan naming.GlobReply)
go func() {
defer close(ch)
it := libstats.Glob(i.suffix, pattern, time.Time{}, false)
for it.Advance() {
- ch <- naming.VDLGlobReplyEntry{naming.VDLMountEntry{Name: it.Value().Key}}
+ ch <- naming.GlobReplyEntry{naming.MountEntry{Name: it.Value().Key}}
}
if err := it.Err(); err != nil {
vlog.VI(1).Infof("libstats.Glob(%q, %q) failed: %v", i.suffix, pattern, err)
diff --git a/services/mounttable/lib/mounttable.go b/services/mounttable/lib/mounttable.go
index f1641a8..4c9554b 100644
--- a/services/mounttable/lib/mounttable.go
+++ b/services/mounttable/lib/mounttable.go
@@ -372,13 +372,13 @@
// ResolveStep returns the next server in a resolution, the name remaining below that server,
// and whether or not that server is another mount table.
-func (ms *mountContext) ResolveStepX(call ipc.ServerCall) (entry naming.VDLMountEntry, err error) {
+func (ms *mountContext) ResolveStepX(call ipc.ServerCall) (entry naming.MountEntry, err error) {
return ms.ResolveStep(call)
}
// ResolveStep returns the next server in a resolution in the form of a MountEntry. The name
// in the mount entry is the name relative to the server's root.
-func (ms *mountContext) ResolveStep(call ipc.ServerCall) (entry naming.VDLMountEntry, err error) {
+func (ms *mountContext) ResolveStep(call ipc.ServerCall) (entry naming.MountEntry, err error) {
vlog.VI(2).Infof("ResolveStep %q", ms.name)
mt := ms.mt
// Find the next mount point for the name.
@@ -400,7 +400,7 @@
defer n.Unlock()
entry.Servers = n.mount.servers.copyToSlice()
entry.Name = strings.Join(elems, "/")
- entry.MT = n.mount.mt
+ entry.ServesMountTable = n.mount.mt
return
}
@@ -579,7 +579,7 @@
}
// globStep is called with n and n.parent locked. Returns with both unlocked.
-func (mt *mountTable) globStep(n *node, name string, pattern *glob.Glob, call ipc.ServerCall, ch chan<- naming.VDLGlobReply) {
+func (mt *mountTable) globStep(n *node, name string, pattern *glob.Glob, call ipc.ServerCall, ch chan<- naming.GlobReply) {
vlog.VI(2).Infof("globStep(%s, %s)", name, pattern)
// If this is a mount point, we're done.
@@ -592,19 +592,19 @@
}
// Don't need the parent lock anymore.
n.parent.Unlock()
- me := naming.VDLMountEntry{
+ me := naming.MountEntry{
Name: name,
}
// Only fill in the mount info if we can resolve this name.
if err := n.satisfies(mt, call, resolveTags); err == nil {
me.Servers = m.servers.copyToSlice()
- me.MT = n.mount.mt
+ me.ServesMountTable = n.mount.mt
} else {
- me.Servers = []naming.VDLMountedServer{}
+ me.Servers = []naming.MountedServer{}
}
// Unlock while we are sending on the channel to avoid livelock.
n.Unlock()
- ch <- naming.VDLGlobReplyEntry{me}
+ ch <- naming.GlobReplyEntry{me}
return
}
@@ -662,7 +662,7 @@
}
// Unlock while we are sending on the channel to avoid livelock.
n.Unlock()
- ch <- naming.VDLGlobReplyEntry{naming.VDLMountEntry{Name: name}}
+ ch <- naming.GlobReplyEntry{naming.MountEntry{Name: name}}
}
// Glob finds matches in the namespace. If we reach a mount point before matching the
@@ -676,7 +676,7 @@
// a state that never existed in the mounttable. For example, if someone removes c/d and later
// adds a/b while a Glob is in progress, the Glob may return a set of nodes that includes both
// c/d and a/b.
-func (ms *mountContext) Glob__(call ipc.ServerCall, pattern string) (<-chan naming.VDLGlobReply, error) {
+func (ms *mountContext) Glob__(call ipc.ServerCall, pattern string) (<-chan naming.GlobReply, error) {
vlog.VI(2).Infof("mt.Glob %v", ms.elems)
g, err := glob.Parse(pattern)
@@ -685,7 +685,7 @@
}
mt := ms.mt
- ch := make(chan naming.VDLGlobReply)
+ ch := make(chan naming.GlobReply)
go func() {
defer close(ch)
// If there was an access error, just ignore the entry, i.e., make it invisible.
@@ -705,7 +705,7 @@
return ch, nil
}
-func (ms *mountContext) linkToLeaf(call ipc.ServerCall, ch chan<- naming.VDLGlobReply) {
+func (ms *mountContext) linkToLeaf(call ipc.ServerCall, ch chan<- naming.GlobReply) {
n, elems, err := ms.mt.findMountPoint(call, ms.elems)
if err != nil || n == nil {
return
@@ -716,7 +716,7 @@
servers[i].Server = naming.Join(s.Server, strings.Join(elems, "/"))
}
n.Unlock()
- ch <- naming.VDLGlobReplyEntry{naming.VDLMountEntry{Name: "", Servers: servers}}
+ ch <- naming.GlobReplyEntry{naming.MountEntry{Name: "", Servers: servers}}
}
func (ms *mountContext) SetPermissions(call ipc.ServerCall, tam access.Permissions, etag string) error {
diff --git a/services/mounttable/lib/mounttable_test.go b/services/mounttable/lib/mounttable_test.go
index af8af91..a158be2 100644
--- a/services/mounttable/lib/mounttable_test.go
+++ b/services/mounttable/lib/mounttable_test.go
@@ -141,7 +141,7 @@
}
}
-func mountentry2names(e *naming.VDLMountEntry) []string {
+func mountentry2names(e *naming.MountEntry) []string {
names := make([]string, len(e.Servers))
for idx, s := range e.Servers {
names[idx] = naming.JoinAddressName(s.Server, e.Name)
@@ -153,14 +153,14 @@
return strs
}
-func resolve(ctx *context.T, name string) (*naming.VDLMountEntry, error) {
+func resolve(ctx *context.T, name string) (*naming.MountEntry, error) {
// Resolve the name one level.
client := v23.GetClient(ctx)
call, err := client.StartCall(ctx, name, "ResolveStep", nil, options.NoResolve{})
if err != nil {
return nil, err
}
- var entry naming.VDLMountEntry
+ var entry naming.MountEntry
if err := call.Finish(&entry); err != nil {
return nil, err
}
@@ -357,7 +357,7 @@
}
var reply []string
for {
- var gr naming.VDLGlobReply
+ var gr naming.GlobReply
err := call.Recv(&gr)
if err == io.EOF {
break
@@ -366,7 +366,7 @@
boom(t, "Glob.StartCall %s: %s", name, pattern, err)
}
switch v := gr.(type) {
- case naming.VDLGlobReplyEntry:
+ case naming.GlobReplyEntry:
if joinServer && len(v.Value.Servers) > 0 {
reply = append(reply, naming.JoinAddressName(v.Value.Servers[0].Server, v.Value.Name))
} else {
@@ -627,7 +627,7 @@
// that will ensure that the client call to the resolved name fails if
// the blessing patterns in the mount entry is not consistent with the
// blessings presented by the end server (once the namespace library
- // changes to respect VDLMountedServer.BlessingPatterns is in place).
+ // changes to respect MountedServer.BlessingPatterns is in place).
rootCtx, aliceCtx, bobCtx, shutdown := initTest()
defer shutdown()
diff --git a/services/mounttable/lib/neighborhood.go b/services/mounttable/lib/neighborhood.go
index 0307070..1093dd1 100644
--- a/services/mounttable/lib/neighborhood.go
+++ b/services/mounttable/lib/neighborhood.go
@@ -5,6 +5,7 @@
"net"
"strconv"
"strings"
+ "time"
"v.io/x/lib/netconfig"
"v.io/x/ref/lib/glob"
@@ -15,6 +16,7 @@
"v.io/v23/security"
"v.io/v23/services/mounttable"
"v.io/v23/services/security/access"
+ vdltime "v.io/v23/vdlroot/time"
"v.io/v23/verror"
"v.io/x/lib/vlog"
@@ -157,12 +159,13 @@
}
// neighbor returns the MountedServers for a particular neighbor.
-func (nh *neighborhood) neighbor(instance string) []naming.VDLMountedServer {
- var reply []naming.VDLMountedServer
+func (nh *neighborhood) neighbor(instance string) []naming.MountedServer {
+ now := time.Now()
+ var reply []naming.MountedServer
si := nh.mdns.ResolveInstance(instance, "veyron")
// Use a map to dedup any addresses seen
- addrMap := make(map[string]uint32)
+ addrMap := make(map[string]vdltime.Deadline)
// Look for any TXT records with addresses.
for _, rr := range si.TxtRRs {
@@ -171,11 +174,12 @@
continue
}
addr := s[len(addressPrefix):]
- addrMap[addr] = rr.Header().Ttl
+ ttl := time.Second * time.Duration(rr.Header().Ttl)
+ addrMap[addr] = vdltime.Deadline{now.Add(ttl)}
}
}
- for addr, ttl := range addrMap {
- reply = append(reply, naming.VDLMountedServer{addr, nil, ttl})
+ for addr, deadline := range addrMap {
+ reply = append(reply, naming.MountedServer{addr, nil, deadline})
}
if reply != nil {
@@ -191,15 +195,16 @@
for _, ip := range ips {
addr := net.JoinHostPort(ip.String(), strconv.Itoa(int(rr.Port)))
ep := naming.FormatEndpoint("tcp", addr)
- reply = append(reply, naming.VDLMountedServer{naming.JoinAddressName(ep, ""), nil, ttl})
+ deadline := vdltime.Deadline{now.Add(time.Second * time.Duration(ttl))}
+ reply = append(reply, naming.MountedServer{naming.JoinAddressName(ep, ""), nil, deadline})
}
}
return reply
}
// neighbors returns all neighbors and their MountedServer structs.
-func (nh *neighborhood) neighbors() map[string][]naming.VDLMountedServer {
- neighbors := make(map[string][]naming.VDLMountedServer, 0)
+func (nh *neighborhood) neighbors() map[string][]naming.MountedServer {
+ neighbors := make(map[string][]naming.MountedServer, 0)
members := nh.mdns.ServiceDiscovery("veyron")
for _, m := range members {
if neighbor := nh.neighbor(m.Name); neighbor != nil {
@@ -211,12 +216,12 @@
}
// ResolveStepX implements ResolveStepX
-func (ns *neighborhoodService) ResolveStepX(call ipc.ServerCall) (entry naming.VDLMountEntry, err error) {
+func (ns *neighborhoodService) ResolveStepX(call ipc.ServerCall) (entry naming.MountEntry, err error) {
return ns.ResolveStep(call)
}
// ResolveStep implements ResolveStep
-func (ns *neighborhoodService) ResolveStep(call ipc.ServerCall) (entry naming.VDLMountEntry, err error) {
+func (ns *neighborhoodService) ResolveStep(call ipc.ServerCall) (entry naming.MountEntry, err error) {
nh := ns.nh
vlog.VI(2).Infof("ResolveStep %v\n", ns.elems)
if len(ns.elems) == 0 {
@@ -232,7 +237,7 @@
entry.Name = ns.name
return
}
- entry.MT = true
+ entry.ServesMountTable = true
entry.Name = naming.Join(ns.elems[1:]...)
entry.Servers = neighbor
return
@@ -257,7 +262,7 @@
}
// Glob__ implements ipc.AllGlobber
-func (ns *neighborhoodService) Glob__(call ipc.ServerCall, pattern string) (<-chan naming.VDLGlobReply, error) {
+func (ns *neighborhoodService) Glob__(call ipc.ServerCall, pattern string) (<-chan naming.GlobReply, error) {
g, err := glob.Parse(pattern)
if err != nil {
return nil, err
@@ -268,14 +273,14 @@
switch len(ns.elems) {
case 0:
- ch := make(chan naming.VDLGlobReply)
+ ch := make(chan naming.GlobReply)
go func() {
defer close(ch)
for k, n := range nh.neighbors() {
if ok, _, _ := g.MatchInitialSegment(k); !ok {
continue
}
- ch <- naming.VDLGlobReplyEntry{naming.VDLMountEntry{Name: k, Servers: n, MT: true}}
+ ch <- naming.GlobReplyEntry{naming.MountEntry{Name: k, Servers: n, ServesMountTable: true}}
}
}()
return ch, nil
@@ -284,8 +289,8 @@
if neighbor == nil {
return nil, verror.New(naming.ErrNoSuchName, call.Context(), ns.elems[0])
}
- ch := make(chan naming.VDLGlobReply, 1)
- ch <- naming.VDLGlobReplyEntry{naming.VDLMountEntry{Name: "", Servers: neighbor, MT: true}}
+ ch := make(chan naming.GlobReply, 1)
+ ch <- naming.GlobReplyEntry{naming.MountEntry{Name: "", Servers: neighbor, ServesMountTable: true}}
close(ch)
return ch, nil
default:
diff --git a/services/mounttable/lib/neighborhood_test.go b/services/mounttable/lib/neighborhood_test.go
index 71802e2..80e8fe4 100644
--- a/services/mounttable/lib/neighborhood_test.go
+++ b/services/mounttable/lib/neighborhood_test.go
@@ -90,7 +90,7 @@
if cerr != nil {
boom(t, "ResolveStep.StartCall: %s", cerr)
}
- var entry naming.VDLMountEntry
+ var entry naming.MountEntry
if err := call.Finish(&entry); err != nil {
boom(t, "ResolveStep: %s", err)
}
diff --git a/services/mounttable/lib/serverlist.go b/services/mounttable/lib/serverlist.go
index 7da55d5..8ab16c4 100644
--- a/services/mounttable/lib/serverlist.go
+++ b/services/mounttable/lib/serverlist.go
@@ -7,6 +7,7 @@
"v.io/v23/naming"
"v.io/v23/security"
+ vdltime "v.io/v23/vdlroot/time"
)
type serverListClock interface {
@@ -117,15 +118,17 @@
}
// copyToSlice returns the contents of the list as a slice of MountedServer.
-func (sl *serverList) copyToSlice() []naming.VDLMountedServer {
+func (sl *serverList) copyToSlice() []naming.MountedServer {
sl.Lock()
defer sl.Unlock()
- var slice []naming.VDLMountedServer
- now := slc.now()
+ var slice []naming.MountedServer
for e := sl.l.Front(); e != nil; e = e.Next() {
s := e.Value.(*server)
- ttl := uint32(s.expires.Sub(now).Seconds())
- ms := naming.VDLMountedServer{Server: s.oa, BlessingPatterns: s.patterns, TTL: ttl}
+ ms := naming.MountedServer{
+ Server: s.oa,
+ BlessingPatterns: s.patterns,
+ Deadline: vdltime.Deadline{s.expires},
+ }
slice = append(slice, ms)
}
return slice
diff --git a/services/mounttable/lib/serverlist_test.go b/services/mounttable/lib/serverlist_test.go
index 77220b0..2815000 100644
--- a/services/mounttable/lib/serverlist_test.go
+++ b/services/mounttable/lib/serverlist_test.go
@@ -8,8 +8,11 @@
"v.io/v23/naming"
"v.io/v23/security"
+ vdltime "v.io/v23/vdlroot/time"
)
+var now = time.Now()
+
type fakeTime struct {
theTime time.Time
}
@@ -21,7 +24,7 @@
ft.theTime = ft.theTime.Add(d)
}
func NewFakeTimeClock() *fakeTime {
- return &fakeTime{theTime: time.Now()}
+ return &fakeTime{theTime: now}
}
func TestServerList(t *testing.T) {
@@ -57,11 +60,11 @@
}
// Test copyToSlice.
- if got, want := sl.copyToSlice(), []naming.VDLMountedServer{
+ if got, want := sl.copyToSlice(), []naming.MountedServer{
{
Server: "endpoint:dfgsfdg@@",
- TTL: 9,
BlessingPatterns: []string{"ep3"},
+ Deadline: vdltime.Deadline{now.Add(15 * time.Second)},
},
}; !reflect.DeepEqual(got, want) {
t.Errorf("Got %v, want %v", got, want)
diff --git a/services/mounttable/mounttabled/mounttabled_v23_test.go b/services/mounttable/mounttabled/mounttabled_v23_test.go
index ce596a2..acbf578 100644
--- a/services/mounttable/mounttabled/mounttabled_v23_test.go
+++ b/services/mounttable/mounttabled/mounttabled_v23_test.go
@@ -36,7 +36,7 @@
clientBin := binaryWithCredentials(i, "cmd", "v.io/x/ref/cmd/mounttable")
// Get the neighborhood endpoint from the mounttable.
- neighborhoodEndpoint := clientBin.Start("glob", name, "nh").ExpectSetEventuallyRE(`^nh (.*) \(TTL .*\)$`)[0][1]
+ neighborhoodEndpoint := clientBin.Start("glob", name, "nh").ExpectSetEventuallyRE(`^nh (.*) \(Deadline .*\)$`)[0][1]
if err := clientBin.Start("mount", "--blessing_pattern=...", name+"/myself", name, "5m").Wait(os.Stdout, os.Stderr); err != nil {
i.Fatalf("failed to mount the mounttable on itself: %v", err)
@@ -50,9 +50,9 @@
// specified for the mounttable.
glob := clientBin.Start("glob", name, "*")
matches := glob.ExpectSetEventuallyRE(
- `^google /www\.google\.com:80 \(TTL .*\)$`,
- `^myself (.*) \(TTL .*\)$`,
- `^nh `+regexp.QuoteMeta(neighborhoodEndpoint)+` \(TTL .*\)$`)
+ `^google /www\.google\.com:80 \(Deadline .*\)$`,
+ `^myself (.*) \(Deadline .*\)$`,
+ `^nh `+regexp.QuoteMeta(neighborhoodEndpoint)+` \(Deadline .*\)$`)
if matches[1][1] != name {
i.Fatalf("expected 'myself' entry to be %q, but was %q", name, matches[1][1])
}
@@ -60,7 +60,7 @@
// Test globbing on the neighborhood name. Its endpoint should be the
// endpoint of the mount table.
glob = clientBin.Start("glob", "/"+neighborhoodEndpoint, neighborhood)
- matches = glob.ExpectSetEventuallyRE("^" + regexp.QuoteMeta(neighborhood) + ` (.*) \(TTL .*\)$`)
+ matches = glob.ExpectSetEventuallyRE("^" + regexp.QuoteMeta(neighborhood) + ` (.*) \(Deadline .*\)$`)
if matches[0][1] != name {
i.Fatalf("expected endpoint of mount table for name %s", neighborhood)
}
diff --git a/services/wsprd/ipc/server/invoker.go b/services/wsprd/ipc/server/invoker.go
index 2f69c03..7c126f9 100644
--- a/services/wsprd/ipc/server/invoker.go
+++ b/services/wsprd/ipc/server/invoker.go
@@ -84,7 +84,7 @@
return &ipc.GlobState{AllGlobber: i}
}
-func (i *invoker) Glob__(call ipc.ServerCall, pattern string) (<-chan naming.VDLGlobReply, error) {
+func (i *invoker) Glob__(call ipc.ServerCall, pattern string) (<-chan naming.GlobReply, error) {
return i.globFunc(pattern, call)
}
diff --git a/services/wsprd/ipc/server/server.go b/services/wsprd/ipc/server/server.go
index fc57e90..6c29c95 100644
--- a/services/wsprd/ipc/server/server.go
+++ b/services/wsprd/ipc/server/server.go
@@ -201,12 +201,12 @@
}
type globStream struct {
- ch chan naming.VDLGlobReply
+ ch chan naming.GlobReply
ctx *context.T
}
func (g *globStream) Send(item interface{}) error {
- if v, ok := item.(naming.VDLGlobReply); ok {
+ if v, ok := item.(naming.GlobReply); ok {
g.ch <- v
return nil
}
@@ -224,16 +224,16 @@
// remoteGlobFunc is a type of function that can invoke a remote glob and
// communicate the result back via the channel returned
-type remoteGlobFunc func(pattern string, call ipc.ServerCall) (<-chan naming.VDLGlobReply, error)
+type remoteGlobFunc func(pattern string, call ipc.ServerCall) (<-chan naming.GlobReply, error)
func (s *Server) createRemoteGlobFunc(handle int32) remoteGlobFunc {
- return func(pattern string, call ipc.ServerCall) (<-chan naming.VDLGlobReply, error) {
+ return func(pattern string, call ipc.ServerCall) (<-chan naming.GlobReply, error) {
// Until the tests get fixed, we need to create a security context before creating the flow
// because creating the security context creates a flow and flow ids will be off.
// See https://github.com/veyron/release-issues/issues/1181
securityCall := s.convertSecurityCall(call, true)
- globChan := make(chan naming.VDLGlobReply, 1)
+ globChan := make(chan naming.GlobReply, 1)
flow := s.helper.CreateNewFlow(s, &globStream{
ch: globChan,
ctx: call.Context(),
@@ -248,7 +248,7 @@
timeout.Time = deadline
}
- errHandler := func(err error) (<-chan naming.VDLGlobReply, error) {
+ errHandler := func(err error) (<-chan naming.GlobReply, error) {
if ch := s.popServerRequest(flow.ID); ch != nil {
s.helper.CleanupFlow(flow.ID)
}
diff --git a/services/wsprd/namespace/namespace.vdl b/services/wsprd/namespace/namespace.vdl
index 2f5a25f..c5fa68a 100644
--- a/services/wsprd/namespace/namespace.vdl
+++ b/services/wsprd/namespace/namespace.vdl
@@ -13,7 +13,7 @@
type Namespace interface {
// Run a glob query and stream the results.
- Glob(pattern string) stream<_, naming.VDLGlobReply> error
+ Glob(pattern string) stream<_, naming.GlobReply> error
// Mount mounts a server under the given name.
Mount(name, server string, ttl time.Duration, replace bool) error
// Unmount removes an existing mount point.
diff --git a/services/wsprd/namespace/namespace.vdl.go b/services/wsprd/namespace/namespace.vdl.go
index 1c21a1c..1d931a5 100644
--- a/services/wsprd/namespace/namespace.vdl.go
+++ b/services/wsprd/namespace/namespace.vdl.go
@@ -198,7 +198,7 @@
Advance() bool
// Value returns the item that was staged by Advance. May panic if Advance
// returned false or was not called. Never blocks.
- Value() naming.VDLGlobReply
+ Value() naming.GlobReply
// Err returns any error encountered by Advance. Never blocks.
Err() error
}
@@ -222,13 +222,13 @@
type implNamespaceGlobClientCall struct {
ipc.ClientCall
- valRecv naming.VDLGlobReply
+ valRecv naming.GlobReply
errRecv error
}
func (c *implNamespaceGlobClientCall) RecvStream() interface {
Advance() bool
- Value() naming.VDLGlobReply
+ Value() naming.GlobReply
Err() error
} {
return implNamespaceGlobClientCallRecv{c}
@@ -242,7 +242,7 @@
c.c.errRecv = c.c.Recv(&c.c.valRecv)
return c.c.errRecv == nil
}
-func (c implNamespaceGlobClientCallRecv) Value() naming.VDLGlobReply {
+func (c implNamespaceGlobClientCallRecv) Value() naming.GlobReply {
return c.c.valRecv
}
func (c implNamespaceGlobClientCallRecv) Err() error {
@@ -525,7 +525,7 @@
// Send places the item onto the output stream. Returns errors encountered
// while sending. Blocks if there is no buffer space; will unblock when
// buffer space is available.
- Send(item naming.VDLGlobReply) error
+ Send(item naming.GlobReply) error
}
}
@@ -548,7 +548,7 @@
// SendStream returns the send side of the Namespace.Glob server stream.
func (s *NamespaceGlobServerCallStub) SendStream() interface {
- Send(item naming.VDLGlobReply) error
+ Send(item naming.GlobReply) error
} {
return implNamespaceGlobServerCallSend{s}
}
@@ -557,6 +557,6 @@
s *NamespaceGlobServerCallStub
}
-func (s implNamespaceGlobServerCallSend) Send(item naming.VDLGlobReply) error {
+func (s implNamespaceGlobServerCallSend) Send(item naming.GlobReply) error {
return s.s.Send(item)
}
diff --git a/services/wsprd/namespace/request_handler.go b/services/wsprd/namespace/request_handler.go
index 6d6ca60..6a2cea2 100644
--- a/services/wsprd/namespace/request_handler.go
+++ b/services/wsprd/namespace/request_handler.go
@@ -30,12 +30,12 @@
stream := call.SendStream()
for mp := range ch {
- var reply naming.VDLGlobReply
+ var reply naming.GlobReply
switch v := mp.(type) {
case *naming.GlobError:
- reply = naming.VDLGlobReplyError{*v}
+ reply = naming.GlobReplyError{*v}
case *naming.MountEntry:
- reply = naming.VDLGlobReplyEntry{convertToVDLEntry(*v)}
+ reply = naming.GlobReplyEntry{*v}
}
if err = stream.Send(reply); err != nil {
return err
@@ -105,19 +105,3 @@
func (s *Server) Delete(call ipc.ServerCall, name string, deleteSubtree bool) error {
return s.ns.Delete(call.Context(), name, deleteSubtree)
}
-
-func convertToVDLEntry(value naming.MountEntry) naming.VDLMountEntry {
- result := naming.VDLMountEntry{
- Name: value.Name,
- MT: value.ServesMountTable(),
- }
- for _, s := range value.Servers {
- result.Servers = append(result.Servers,
- naming.VDLMountedServer{
- Server: s.Server,
- TTL: uint32(s.Expires.Sub(time.Now())),
- BlessingPatterns: s.BlessingPatterns,
- })
- }
- return result
-}
diff --git a/test/modules/core/mounttable.go b/test/modules/core/mounttable.go
index 4e7c335..95768a1 100644
--- a/test/modules/core/mounttable.go
+++ b/test/modules/core/mounttable.go
@@ -90,7 +90,7 @@
output += fmt.Sprintf("R%d=%s[", entry, v.Name)
t := ""
for _, s := range v.Servers {
- t += fmt.Sprintf("%s:%s, ", s.Server, s.Expires)
+ t += fmt.Sprintf("%s:%s, ", s.Server, s.Deadline.Time)
}
t = strings.TrimSuffix(t, ", ")
output += fmt.Sprintf("%s]\n", t)
diff --git a/test/testutil/glob.go b/test/testutil/glob.go
index da3220a..fe249f8 100644
--- a/test/testutil/glob.go
+++ b/test/testutil/glob.go
@@ -22,13 +22,13 @@
globErrors := []naming.GlobError{}
Loop:
for {
- var gr naming.VDLGlobReply
+ var gr naming.GlobReply
switch err := call.Recv(&gr); err {
case nil:
switch v := gr.(type) {
- case naming.VDLGlobReplyEntry:
+ case naming.GlobReplyEntry:
results = append(results, v.Value.Name)
- case naming.VDLGlobReplyError:
+ case naming.GlobReplyError:
globErrors = append(globErrors, v.Value)
}
case io.EOF:
