Merge branch 'v2.0' into 'master'

agneum · agneum · commit 7252a3c3c824 · 2020-11-13T03:58:20.000Z
port fixes from 2.0 branch

See merge request postgres-ai/database-lab!203
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -171,7 +171,9 @@ build-image-latest-server:
     REGISTRY: "${DH_CI_REGISTRY}"
     DOCKER_FILE: "Dockerfile.dblab-server"
     DOCKER_NAME: "postgresai/dblab-server"
-    TAGS: "${DOCKER_NAME}:latest,${DOCKER_NAME}:${CI_COMMIT_TAG}"
+  before_script:
+    - export LATEST_TAG=$(echo ${CI_COMMIT_TAG%.*}-latest)
+    - export TAGS="${DOCKER_NAME}:${LATEST_TAG},${DOCKER_NAME}:${CI_COMMIT_TAG}"
 
 build-image-latest-client:
   <<: *build_image_definition
@@ -182,7 +184,9 @@ build-image-latest-client:
     REGISTRY: "${DH_CI_REGISTRY}"
     DOCKER_FILE: "Dockerfile.dblab"
     DOCKER_NAME: "postgresai/dblab"
-    TAGS: "${DOCKER_NAME}:latest,${DOCKER_NAME}:${CI_COMMIT_TAG}"
+  before_script:
+    - export LATEST_TAG=$(echo ${CI_COMMIT_TAG%.*}-latest)
+    - export TAGS="${DOCKER_NAME}:${LATEST_TAG},${DOCKER_NAME}:${CI_COMMIT_TAG}"
 
 build-image-rc-server:
   <<: *build_image_definition
@@ -212,4 +216,6 @@ build-image-swagger-latest:
   variables:
     DOCKER_FILE: "Dockerfile.swagger-ui"
     DOCKER_NAME: "registry.gitlab.com/postgres-ai/database-lab/dblab-swagger-ui"
-    TAGS: "${DOCKER_NAME}:latest"
+  before_script:
+    - export LATEST_TAG=$(echo ${CI_COMMIT_TAG%.*}-latest)
+    - export TAGS="${DOCKER_NAME}:${LATEST_TAG}"
diff --git a/pkg/retrieval/engine/postgres/snapshot/physical.go b/pkg/retrieval/engine/postgres/snapshot/physical.go
@@ -76,7 +76,6 @@ type PhysicalInitial struct {
 	dbMark         *dbmarker.Config
 	dockerClient   *client.Client
 	scheduler      *cron.Cron
-	scheduleOnce   sync.Once
 	promotionMutex sync.Mutex
 }
 
@@ -188,10 +187,18 @@ func (p *PhysicalInitial) Name() string {
 // Run starts the job.
 func (p *PhysicalInitial) Run(ctx context.Context) (err error) {
 	// Start scheduling after initial snapshot.
-	defer func() {
-		p.scheduleOnce.Do(p.startScheduler(ctx))
-	}()
+	defer p.startScheduler(ctx)()
+
+	if p.options.SkipStartSnapshot {
+		log.Msg("Skip taking a snapshot at the start")
+
+		return nil
+	}
 
+	return p.run(ctx)
+}
+
+func (p *PhysicalInitial) run(ctx context.Context) (err error) {
 	select {
 	case <-ctx.Done():
 		if p.scheduler != nil {
@@ -204,12 +211,6 @@ func (p *PhysicalInitial) Run(ctx context.Context) (err error) {
 	default:
 	}
 
-	if p.options.SkipStartSnapshot {
-		log.Msg("Skip taking a snapshot at the start")
-
-		return nil
-	}
-
 	p.dbMark.DataStateAt = extractDataStateAt(p.dbMarker)
 
 	// Snapshot data.
@@ -304,7 +305,7 @@ func (p *PhysicalInitial) startScheduler(ctx context.Context) func() {
 
 func (p *PhysicalInitial) runAutoSnapshot(ctx context.Context) func() {
 	return func() {
-		if err := p.Run(ctx); err != nil {
+		if err := p.run(ctx); err != nil {
 			log.Err(errors.Wrap(err, "failed to take a snapshot automatically"))
 
 			log.Msg("Interrupt automatic snapshots")
diff --git a/pkg/services/cloning/mode_base.go b/pkg/services/cloning/mode_base.go
@@ -289,7 +289,11 @@ func (c *baseCloning) UpdateCloneStatus(cloneID string, status models.Status) er
 func (c *baseCloning) ResetClone(cloneID string) error {
 	w, ok := c.findWrapper(cloneID)
 	if !ok {
-		return models.New(models.ErrCodeNotFound, "clone not found")
+		return models.New(models.ErrCodeNotFound, "the clone not found")
+	}
+
+	if w.session == nil {
+		return models.New(models.ErrCodeNotFound, "clone is not started yet")
 	}
 
 	if err := c.UpdateCloneStatus(cloneID, models.Status{
@@ -299,10 +303,6 @@ func (c *baseCloning) ResetClone(cloneID string) error {
 		return errors.Wrap(err, "failed to update clone status")
 	}
 
-	if w.session == nil {
-		return models.New(models.ErrCodeNotFound, "clone is not started yet")
-	}
-
 	go func() {
 		err := c.provision.ResetSession(w.session, w.snapshot.ID)
 		if err != nil {
