[WIP] Update to Gitbase v0.20.0 #439

se7entyse7en · 2019-04-12T16:47:27Z

Closes #424.

Marked as WIP as waiting for final Gitbase v0.20.0 release.

This PR removes the MysqlCli component and uses the MySql client provided by Gitbase itself.

se7entyse7en · 2019-04-16T13:11:06Z

The tests are failing due to a bug that will be fixed by #432.

carlosms · 2019-04-18T16:30:49Z

Looks good so far.
But it looks like there are more test that are failing, not only because of #432.

se7entyse7en · 2019-04-18T17:22:42Z

@carlosms thanks I didn't notice. To simplify review I've just rebased to master to solve conflicts, gonna address the tests now and also update to beta3.

smacker · 2019-04-22T10:32:37Z

cmd/srcd/cmd/sql.go

@@ -192,81 +162,32 @@ func startGitbaseWithClient(client api.EngineClient) error {
 		return humanizef(err, "could not start gitbase")
 	}

-	if err := docker.EnsureInstalled(components.MysqlCli.Image, components.MysqlCli.Version); err != nil {


this function has name startGitbaseWithClient but it doesn't start client anymore. Just gitbase.

done here and here.

smacker · 2019-04-22T10:46:08Z

docker/docker_exec.go

+			}
+
+			defer func() {
+				err = term.RestoreTerminal(fd, prevState)


this error is never returned from the function

refactored this part here. It should be clearer now and the code is more decoupled.

smacker · 2019-04-22T10:47:31Z

docker/docker_exec.go

+	return &insResp, nil
+}
+
+func withRawTerminal(in io.ReadCloser, fn func() error) func() error {


the name of this function and arguments below are a little confusing. withRawTerminal and rawTerminal. But actually you pass true and call this function even for non-terminal.

answered here.

smacker · 2019-04-22T10:50:53Z

cmd/srcd/cmd/sql.go

-	err := docker.RemoveContainer(components.MysqlCli.Name)
-	if err != nil {
-		log.Warningf("could not stop mysql client: %v", err)
+	if insResp.ExitCode != 0 {


not sure if we have tests for it. What happens when you exit with ctrl-c or ctrl-d? Does it exit correctly with exit code 0?

Nice catch! Now it exits with 0 on ctrl-d but not on ctrl-c. Gonna try adding a test for these.

maybe it's okay to exit with error on ctrl-c in this case

added a test for Ctrl-D here.

smacker · 2019-04-23T16:25:44Z

docker/docker_exec.go


-		return fn()
-	}
+type stdioAttaccher struct {


attach -> attacher

🤦‍♂️

Addressed here.

smacker · 2019-04-23T16:30:40Z

docker/docker_exec.go

+		// characters
+		prevState, err = term.SetRawTerminal(fd)
+		if err != nil {
+			done <- err


you have deadlock here

😮 eagle's eye! thanks for noticing

Addressed here

smacker · 2019-04-23T16:40:33Z

docker/docker_exec.go

@@ -155,7 +155,10 @@ func (sa *stdioAttacher) withRawTerminal(fn attachFn) <-chan error {
 		// characters
 		prevState, err = term.SetRawTerminal(fd)
 		if err != nil {
-			done <- err
+			go func() {


maybe it's better to make the channel buffered?

Even if in this case would slightly increase readability, I think that using an unbuffered channel keeps the code simpler compared to the readability gain of using a buffered channel.

what exactly do you see as a downside of a buffered channel?

it's just an easier model to think 😄

Signed-off-by: Lou Marvin Caraig <[email protected]>

… containers Signed-off-by: Lou Marvin Caraig <[email protected]>

Signed-off-by: Lou Marvin Caraig <[email protected]>

…cess Signed-off-by: Lou Marvin Caraig <[email protected]>

Signed-off-by: Lou Marvin Caraig <[email protected]>

I've separatead the starting of a component into a different function so that it can be used by other commands as well. Signed-off-by: Lou Marvin Caraig <[email protected]>

Signed-off-by: Lou Marvin Caraig <[email protected]>

se7entyse7en · 2019-04-26T10:55:19Z

Rebased on master and updated to use gitbase-v0.20.0-beta4.

Signed-off-by: Lou Marvin Caraig <[email protected]>

se7entyse7en · 2019-05-01T08:34:55Z

Updated to gitbase-v0.20.0-rc1.

se7entyse7en requested review from smacker, carlosms and dpordomingo April 12, 2019 16:47

se7entyse7en force-pushed the gitbase-v0.20.0 branch from 247c1eb to c273f26 Compare April 12, 2019 17:15

se7entyse7en force-pushed the gitbase-v0.20.0 branch from c273f26 to 0e26c76 Compare April 18, 2019 17:20

smacker reviewed Apr 22, 2019

View reviewed changes

se7entyse7en force-pushed the gitbase-v0.20.0 branch from aef630a to 4e151e4 Compare April 23, 2019 16:16

smacker reviewed Apr 23, 2019

View reviewed changes

se7entyse7en added 14 commits April 26, 2019 11:47

Updated Gitbase version to v0.20.0-beta2

2ca6e9b

Signed-off-by: Lou Marvin Caraig <[email protected]>

Added docker_exec.go with functions for executing commands in running…

cf1581d

… containers Signed-off-by: Lou Marvin Caraig <[email protected]>

Modified srcd sql command to use the mysql cli embedded in gitbase

08072c8

Signed-off-by: Lou Marvin Caraig <[email protected]>

Removed MysqlCli component

57c3767

Signed-off-by: Lou Marvin Caraig <[email protected]>

Removed references to MysqlCli component

baf3b29

Signed-off-by: Lou Marvin Caraig <[email protected]>

Fixed SQLREPLTestSuite

a8f3495

Signed-off-by: Lou Marvin Caraig <[email protected]>

Fixed components test

535e6ce

Signed-off-by: Lou Marvin Caraig <[email protected]>

Fixes in docker_exec.go

cf6f9f3

Signed-off-by: Lou Marvin Caraig <[email protected]>

Changed signature of Exec and ExecAttach to return status of exec pro…

8f602fc

…cess Signed-off-by: Lou Marvin Caraig <[email protected]>

Added check for exit code of MySQL cli in sql command

ea992d2

Signed-off-by: Lou Marvin Caraig <[email protected]>

Updatead gitbase to v0.20.0-beta3

4304ec3

Signed-off-by: Lou Marvin Caraig <[email protected]>

Refactored components start cmd

d3a5a0c

I've separatead the starting of a component into a different function so that it can be used by other commands as well. Signed-off-by: Lou Marvin Caraig <[email protected]>

Reused startComponent function to start Gitbase component in sql command

9ae3c1c

Signed-off-by: Lou Marvin Caraig <[email protected]>

Refactored how stdio is attached

6508793

Signed-off-by: Lou Marvin Caraig <[email protected]>

se7entyse7en added 5 commits April 26, 2019 12:31

Added test for interactive REPL ensuring correct exit with Ctrl-D

a495ab9

Signed-off-by: Lou Marvin Caraig <[email protected]>

Fixed typo in stdioAttacher name

15cd0be

Signed-off-by: Lou Marvin Caraig <[email protected]>

Fixed deadlock in withRawTerminal method

602fbe7

Signed-off-by: Lou Marvin Caraig <[email protected]>

Updated Gitbase version to v0.20.0-beta4

4db06e2

Signed-off-by: Lou Marvin Caraig <[email protected]>

Fixed TestSQLTestSuite/TestWrongQuery

0369669

Signed-off-by: Lou Marvin Caraig <[email protected]>

se7entyse7en force-pushed the gitbase-v0.20.0 branch from c39c87b to 0369669 Compare April 26, 2019 10:54

se7entyse7en added 2 commits April 26, 2019 13:18

Update go.mod and vendor/modules.txt

352d0f2

Signed-off-by: Lou Marvin Caraig <[email protected]>

Update gitbase component to v0.20.0-rc1

1926b78

Signed-off-by: Lou Marvin Caraig <[email protected]>

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[WIP] Update to Gitbase v0.20.0 #439

[WIP] Update to Gitbase v0.20.0 #439

se7entyse7en commented Apr 12, 2019 •

edited

Loading

se7entyse7en commented Apr 16, 2019

carlosms commented Apr 18, 2019

se7entyse7en commented Apr 18, 2019

smacker Apr 22, 2019

se7entyse7en Apr 23, 2019

smacker Apr 22, 2019

se7entyse7en Apr 23, 2019

smacker Apr 22, 2019

se7entyse7en Apr 23, 2019

smacker Apr 22, 2019

se7entyse7en Apr 23, 2019 •

edited

Loading

smacker Apr 23, 2019

se7entyse7en Apr 23, 2019

smacker Apr 23, 2019

se7entyse7en Apr 23, 2019

se7entyse7en Apr 23, 2019

smacker Apr 23, 2019

se7entyse7en Apr 23, 2019

se7entyse7en Apr 23, 2019

smacker Apr 23, 2019

se7entyse7en Apr 23, 2019

smacker Apr 23, 2019

se7entyse7en Apr 23, 2019

se7entyse7en commented Apr 26, 2019

se7entyse7en commented May 1, 2019 •

edited

Loading

[WIP] Update to Gitbase v0.20.0 #439

Are you sure you want to change the base?

[WIP] Update to Gitbase v0.20.0 #439

Conversation

se7entyse7en commented Apr 12, 2019 • edited Loading

se7entyse7en commented Apr 16, 2019

carlosms commented Apr 18, 2019

se7entyse7en commented Apr 18, 2019

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

se7entyse7en Apr 23, 2019 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

se7entyse7en commented Apr 26, 2019

se7entyse7en commented May 1, 2019 • edited Loading

se7entyse7en commented Apr 12, 2019 •

edited

Loading

se7entyse7en Apr 23, 2019 •

edited

Loading

se7entyse7en commented May 1, 2019 •

edited

Loading