diff options
| author | Justine Olshan <justineolshan@google.com> | 2018-07-18 16:57:29 -0700 |
|---|---|---|
| committer | Shentubot <shentubot@google.com> | 2018-07-18 16:58:30 -0700 |
| commit | c05660373e8bda36ddf5181220c76f4327f2abc6 (patch) | |
| tree | 019da46831903e23e9a2283e127835659dcadbfb /pkg/urpc | |
| parent | e5d8f99c6071c09aa7bca4e79d28b26f95dc7716 (diff) | |
Moved restore code out of create and made to be called after create.
Docker expects containers to be created before they are restored.
However, gVisor restoring requires specificactions regarding the kernel
and the file system. These actions were originally in booting the sandbox.
Now setting up the file system is deferred until a call to a call to
runsc start. In the restore case, the kernel is destroyed and a new kernel
is created in the same process, as we need the same process for Docker.
These changes required careful execution of concurrent processes which
required the use of a channel.
Full docker integration still needs the ability to restore into the same
container.
PiperOrigin-RevId: 205161441
Change-Id: Ie1d2304ead7e06855319d5dc310678f701bd099f
Diffstat (limited to 'pkg/urpc')
| -rw-r--r-- | pkg/urpc/urpc.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkg/urpc/urpc.go b/pkg/urpc/urpc.go index 0f2b5ccce..af620b704 100644 --- a/pkg/urpc/urpc.go +++ b/pkg/urpc/urpc.go @@ -570,7 +570,7 @@ func (c *Client) Call(method string, arg interface{}, result interface{}) error callR := callResult{Result: result} newFs, err := unmarshal(c.Socket, &callR) if err != nil { - return err + return fmt.Errorf("urpc method %q failed: %v", method, err) } // Set the file payload. |