Add controls form container start, stop, pause, etc #598

tomwilkie · 2015-10-27T18:19:02Z

Add control interface for Scope. Allows UI to do RPCs all the way back to the probe, with the app doing the routing in the middle. Add metadata in the API so these controls can be appropriately rendered, and add some basic support in the UI.

This is a very hacky, very early implementation. Fixes #315 (see bug for some design notes).

Also:

Docker integration adds controls for container lifecycle
include non-running docker containers in the report, dynamically update docker container states
add a filter to filter out non-running containers

Todo

Make it lint & pass tests
Try and use bits and bobs from golang rpc
Separate control http mux/router in the app
Add tests for capabilities
Reorganise change sets.
Make mutli client delete old apps
Document / comment code
Integration test
Make UI reflect result of control RPC (@davkal?)

Punted out of this PR:

Add 'latest' CRDT, make UI update quicker. #628 LatestMap on reports (cause of multiple states and delays)
Make state updates on containers trigger a mini report push. #629 State updates (for containers) could trigger earlier report pushes (suggestion from demo)
Consider merging AppClient and HTTP Publisher. #630 Consider merging AppClient and HTTP Publisher.

client/app/scripts/components/node-details-table.js

@@ -11,6 +12,15 @@ const NodeDetailsTable = React.createClass({
          {this.props.title}
        </h4>

+
+        <div className="node-details-table-row">
+        {this.props.capabilities.map(function(capability) {


probe/capabilities/capabilities.go

+	handlers = map[string]xfer.CapabilityHandler{}
+)
+
+// HandleCapabilityRequest performs a capability request.


paulbellamy · 2015-10-28T11:43:53Z

Just curious how you see the request/response model working with longer-running (interactive) capabilities, like shell? Bridging through a websocket to the user's browser? or separate request/response for each chunk of data?

app/capabilities.go

+const capabilityKey = "capability"
+
+// CapabilityRouter handles the impedence mismatch between posted Capability calls,
+// and websocket connections.


tomwilkie · 2015-10-28T12:02:35Z

Just curious how you see the request/response model working with longer-running (interactive) capabilities, like shell?

I don't think we can build shell / logs with this just yet. I think we need to layer some more abstraction/plumbing on top first.

I'm currently thinking that a request could return a 'pipe' instead a response. The pipe would have a different lifecycle, and use different messages on the same websocket. We might be able to use app<->client websocket too.

Anyway I suggest we get the short-lived RPCs bit (start, stop, restart etc) right first, then think about logs & terminals.

app/controls.go

+		nodeID  = vars["nodeID"]
+		control = vars["control"]
+	)
+	handler, ok := cr.probes[probeID]


paulbellamy · 2015-11-02T11:28:26Z

Would it make sense to have this? i.e. treating controls as a "plugin" with app and probe components.

.
└── controls
    ├── app
        └── *.go
    └── probe
        └── *.go

Thinking about it, they are fairly tightly integrated with the docker probe plugin and everything else, so maybe this doesn't make sense...

tomwilkie · 2015-11-02T11:33:08Z

re: treating as a plugin; as you say, the code it pretty tightly integrated, so I think the division you suggest would be pretty artificial.

I'm trying to do the following:

have the common bits (ie on the wire format, codecs etc) in xfer/
have the app specific bits (accepting a control from the UI, routing it to the right probe) in the app/
have the probe specific bits (handling the control, routing to appropriate handler) in probe/

The bit that doesn't fit it the probe's connection to the app logic, which I've put in xfer/, as thats where the http publisher are. On could argue this belongs in probe/, but I'm not too fussed either way.

probe/docker/controls.go

+		return xfer.ResponseErrorf("Invalid ID: %s", req.NodeID)
+	}
+
+	return xfer.ResponseError(container.Stop())


paulbellamy · 2015-11-02T13:14:29Z

There's a period when stopping or starting the container that you get all three controls available.

Also, the controls take quite a while to have a visible effect, and there's very little feedback that it is doing something.

paulbellamy · 2015-11-02T13:15:28Z

Should probably show the container state in the details panel.

paulbellamy · 2015-11-02T13:56:01Z

Needs a make static, also.

tomwilkie · 2015-11-02T14:05:53Z

Should probably show the container state in the details panel.

done.

tomwilkie · 2015-11-02T14:06:16Z

There's a period when stopping or starting the container that you get all three controls available.

After discussion, this has been punted to the next PR.

probe/controls/controls_test.go

+)
+
+func TestControls(t *testing.T) {
+	controls.Register("foo", func(req xfer.Request) xfer.Response {


tomwilkie · 2015-11-05T12:22:01Z

+0.2% on coverage with 1.2k new loc!

paulbellamy · 2015-11-06T14:56:03Z

Backend LGTM

…g, and a filter for those containers. Also add integration test for container controls.

- Make backend address configurable via env variable - `BACKEND_HOST=1.2.3.4:4040 npm start` points the frontend to the app on that server. Just for development - Render control icons - removed close x for details panel - added control icons in its space - closing of panel still works by clicking on same node, or background - Dont allow control while pending - Render and auto-dismiss control error - Make tests pass

tomwilkie · 2015-11-06T18:22:02Z

Frontend LGTM.

Add controls form container start, stop, pause, etc

tomwilkie self-assigned this Oct 27, 2015

tomwilkie force-pushed the 315-capabilities branch from 4ec4b3e to 08a8d18 Compare October 27, 2015 19:27

davkal reviewed Oct 27, 2015
View reviewed changes

tomwilkie changed the title ~~[WIP] Beginnings of capability support.~~ [WIP] Add controls Oct 28, 2015

paulbellamy reviewed Oct 28, 2015
View reviewed changes

probe/capabilities/capabilities.go

handlers = map[string]xfer.CapabilityHandler{}

)

// HandleCapabilityRequest performs a capability request.

This comment was marked as abuse.

Sign in to view

paulbellamy reviewed Oct 28, 2015
View reviewed changes

app/capabilities.go

const capabilityKey = "capability"

// CapabilityRouter handles the impedence mismatch between posted Capability calls,

// and websocket connections.

This comment was marked as abuse.

Sign in to view

tomwilkie force-pushed the 315-capabilities branch from 08a8d18 to db576eb Compare October 28, 2015 11:59

tomwilkie force-pushed the 315-capabilities branch 6 times, most recently from 260c822 to 9e71d98 Compare October 30, 2015 10:03

paulbellamy reviewed Nov 2, 2015
View reviewed changes

app/controls.go

nodeID = vars["nodeID"]

control = vars["control"]

)

handler, ok := cr.probes[probeID]

This comment was marked as abuse.

Sign in to view

This comment was marked as abuse.

Sign in to view

paulbellamy reviewed Nov 2, 2015
View reviewed changes

probe/docker/controls.go

return xfer.ResponseErrorf("Invalid ID: %s", req.NodeID)

}

return xfer.ResponseError(container.Stop())

This comment was marked as abuse.

Sign in to view

This comment was marked as abuse.

Sign in to view

tomwilkie force-pushed the 315-capabilities branch 6 times, most recently from 38da875 to 970f75f Compare November 3, 2015 12:02

tomwilkie changed the title ~~[WIP] Add controls~~ Add controls Nov 3, 2015

tomwilkie changed the title ~~Add controls~~ Add controls form container start, stop, pause, etc Nov 3, 2015

tomwilkie removed their assignment Nov 3, 2015

paulbellamy reviewed Nov 3, 2015
View reviewed changes

probe/controls/controls_test.go

)

func TestControls(t *testing.T) {

controls.Register("foo", func(req xfer.Request) xfer.Response {

This comment was marked as abuse.

Sign in to view

This comment was marked as abuse.

Sign in to view

tomwilkie force-pushed the 315-capabilities branch 2 times, most recently from 7cc0fca to a8edc2c Compare November 4, 2015 16:38

tomwilkie force-pushed the 315-capabilities branch from 9bb9662 to dfadc3e Compare November 5, 2015 16:56

davkal self-assigned this Nov 5, 2015

tomwilkie added 2 commits November 6, 2015 17:39

Add Control plumbing.

76d3433

Add docker lifecycle controls, containers in states other that runnin…

8f957c4

…g, and a filter for those containers. Also add integration test for container controls.

tomwilkie force-pushed the 315-capabilities branch from 2bcca11 to 951bb55 Compare November 6, 2015 17:43

tomwilkie force-pushed the 315-capabilities branch from 951bb55 to abcb94b Compare November 6, 2015 17:44

tomwilkie added a commit that referenced this pull request Nov 6, 2015

Merge pull request #598 from weaveworks/315-capabilities

39b6630

Add controls form container start, stop, pause, etc

tomwilkie merged commit 39b6630 into master Nov 6, 2015

tomwilkie deleted the 315-capabilities branch November 6, 2015 18:22

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add controls form container start, stop, pause, etc #598

Add controls form container start, stop, pause, etc #598

tomwilkie commented Oct 27, 2015

This comment was marked as abuse.

This comment was marked as abuse.

This comment was marked as abuse.

paulbellamy commented Oct 28, 2015

This comment was marked as abuse.

tomwilkie commented Oct 28, 2015

This comment was marked as abuse.

This comment was marked as abuse.

paulbellamy commented Nov 2, 2015

tomwilkie commented Nov 2, 2015

This comment was marked as abuse.

This comment was marked as abuse.

paulbellamy commented Nov 2, 2015

paulbellamy commented Nov 2, 2015

paulbellamy commented Nov 2, 2015

tomwilkie commented Nov 2, 2015

tomwilkie commented Nov 2, 2015

This comment was marked as abuse.

This comment was marked as abuse.

tomwilkie commented Nov 5, 2015

paulbellamy commented Nov 6, 2015

tomwilkie commented Nov 6, 2015

Add controls form container start, stop, pause, etc #598

Add controls form container start, stop, pause, etc #598

Conversation

tomwilkie commented Oct 27, 2015

This comment was marked as abuse.

This comment was marked as abuse.

This comment was marked as abuse.

paulbellamy commented Oct 28, 2015

This comment was marked as abuse.

tomwilkie commented Oct 28, 2015

This comment was marked as abuse.

This comment was marked as abuse.

paulbellamy commented Nov 2, 2015

tomwilkie commented Nov 2, 2015

This comment was marked as abuse.

This comment was marked as abuse.

paulbellamy commented Nov 2, 2015

paulbellamy commented Nov 2, 2015

paulbellamy commented Nov 2, 2015

tomwilkie commented Nov 2, 2015

tomwilkie commented Nov 2, 2015

This comment was marked as abuse.

This comment was marked as abuse.

tomwilkie commented Nov 5, 2015

paulbellamy commented Nov 6, 2015

tomwilkie commented Nov 6, 2015