runtime: Fail when GCE metadata is inaccessible
When V23_EXPECT_GOOGLE_COMPUTE_ENGINE is set and non-empty, the runtime
will fail to initialize when the GCE metadata server is inaccessible or
some of its data cannot be retrieved.
When V23_EXPECT_GOOGLE_COMPUTE_ENGINE is not set (or is empty), the
previous behavior is preserved, i.e. we give up after 1 second and
assume we're not on GCE.
Production services cannot function properly when the metadata isn't
there. It's better to abort immediately than to keep running in a bad
state.
While at it, clean up the code around cloud VM metadata.
Fixes https://github.com/vanadium/issues/issues/1267
Change-Id: I933f97179b994c83460b2efe6658c8f098689531
diff --git a/runtime/factories/gce/gce.go b/runtime/factories/gce/gce.go
deleted file mode 100644
index a78018f..0000000
--- a/runtime/factories/gce/gce.go
+++ /dev/null
@@ -1,80 +0,0 @@
-// Copyright 2015 The Vanadium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build linux
-
-// Package gce implements a RuntimeFactory for binaries that only run on Google
-// Compute Engine (GCE).
-package gce
-
-import (
- "flag"
- "fmt"
- "net"
-
- "v.io/v23"
- "v.io/v23/context"
- "v.io/v23/flow"
- "v.io/v23/rpc"
-
- "v.io/x/lib/netstate"
- "v.io/x/ref/lib/flags"
- "v.io/x/ref/runtime/internal"
- "v.io/x/ref/runtime/internal/gce"
- "v.io/x/ref/runtime/internal/lib/appcycle"
- grt "v.io/x/ref/runtime/internal/rt"
- "v.io/x/ref/runtime/protocols/lib/websocket"
- _ "v.io/x/ref/runtime/protocols/tcp"
- _ "v.io/x/ref/runtime/protocols/ws"
- _ "v.io/x/ref/runtime/protocols/wsh"
-)
-
-var commonFlags *flags.Flags
-
-func init() {
- v23.RegisterRuntimeFactory(Init)
- flow.RegisterUnknownProtocol("wsh", websocket.WSH{})
- commonFlags = flags.CreateAndRegister(flag.CommandLine, flags.Runtime, flags.Listen)
-}
-
-func Init(ctx *context.T) (v23.Runtime, *context.T, v23.Shutdown, error) {
- if err := internal.ParseFlagsAndConfigureGlobalLogger(commonFlags); err != nil {
- return nil, nil, nil, err
- }
-
- if !gce.RunningOnGCE() {
- return nil, nil, nil, fmt.Errorf("GCE profile used on a non-GCE system")
- }
-
- ac := appcycle.New()
-
- lf := commonFlags.ListenFlags()
- listenSpec := rpc.ListenSpec{
- Addrs: rpc.ListenAddrs(lf.Addrs),
- Proxy: lf.Proxy,
- }
-
- if ip, err := gce.ExternalIPAddress(); err != nil {
- ac.Shutdown()
- return nil, nil, nil, err
- } else {
- listenSpec.AddressChooser = netstate.AddressChooserFunc(func(network string, addrs []net.Addr) ([]net.Addr, error) {
- return []net.Addr{netstate.NewNetAddr("wsh", ip.String())}, nil
- })
- }
-
- runtime, ctx, shutdown, err := grt.Init(ctx, ac, nil, nil, nil, &listenSpec, nil, commonFlags.RuntimeFlags(), nil, 0)
- if err != nil {
- ac.Shutdown()
- return nil, nil, nil, err
- }
-
- ctx.VI(1).Infof("Initializing GCE RuntimeFactory.")
-
- runtimeFactoryShutdown := func() {
- ac.Shutdown()
- shutdown()
- }
- return runtime, ctx, runtimeFactoryShutdown, nil
-}
diff --git a/runtime/factories/roaming/roaming.go b/runtime/factories/roaming/roaming.go
index 32b596d..7c84342 100644
--- a/runtime/factories/roaming/roaming.go
+++ b/runtime/factories/roaming/roaming.go
@@ -50,6 +50,10 @@
return nil, nil, nil, err
}
+ if err := internal.InitCloudVM(); err != nil {
+ return nil, nil, nil, err
+ }
+
ac := appcycle.New()
discoveryFactory, err := dfactory.New(ctx)
if err != nil {
