single export

draft contains some todos
treeverse · Nov 8, 2020 · cfb3774 · cfb3774
1 parent fcffe26
commit cfb3774
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 19 deletions.
diff --git a/cmd/lakefs/cmd/run.go b/cmd/lakefs/cmd/run.go
@@ -91,12 +91,7 @@ var runCmd = &cobra.Command{
 		dedupCleaner := dedup.NewCleaner(blockStore, cataloger.DedupReportChannel())
 
 		// parade
-		paradeDBParams := cfg.GetParadeDatabaseParams()
-		paradeDBPool, err := db.ConnectDBPool(paradeDBParams)
-		if err != nil {
-			logger.WithError(err).Errorf("Failed to connect parade database")
-		}
-		paradeDB := parade.NewParadeDB(paradeDBPool)
+		paradeDB := parade.NewParadeDB(dbPool.Pool())
 		// export handler
 		exportHandler := export.NewHandler(blockStore, cataloger, paradeDB)
 		exportActionManager := parade.NewActionManager(exportHandler, paradeDB, nil)
@@ -105,7 +100,6 @@ var runCmd = &cobra.Command{
 			_ = cataloger.Close()
 			_ = dedupCleaner.Close()
 			exportActionManager.Close()
-			paradeDBPool.Close()
 		}()
 
 		// start API server

diff --git a/config/config.go b/config/config.go
@@ -22,8 +22,7 @@ import (
 )
 
 const (
-	DefaultDatabaseConnString       = "postgres://localhost:5432/postgres?sslmode=disable"
-	DefaultParadeDatabaseConnString = "postgres://localhost:5432/parade?sslmode=disable"
+	DefaultDatabaseConnString = "postgres://localhost:5432/postgres?sslmode=disable"
 
 	DefaultBlockStoreType                    = "local"
 	DefaultBlockStoreLocalPath               = "~/lakefs/data"
@@ -80,7 +79,6 @@ func setDefaults() {
 	viper.SetDefault("logging.output", DefaultLoggingOutput)
 
 	viper.SetDefault("database.connection_string", DefaultDatabaseConnString)
-	viper.SetDefault("parade.database.connection_string", DefaultParadeDatabaseConnString)
 
 	viper.SetDefault("auth.cache.enabled", DefaultAuthCacheEnabled)
 	viper.SetDefault("auth.cache.size", DefaultAuthCacheSize)
@@ -113,15 +111,6 @@ func (c *Config) GetDatabaseParams() dbparams.Database {
 	}
 }
 
-func (c *Config) GetParadeDatabaseParams() dbparams.Database {
-	return dbparams.Database{
-		ConnectionString:      viper.GetString("parade.database.connection_string"),
-		MaxOpenConnections:    viper.GetInt32("parade.database.max_open_connections"),
-		MaxIdleConnections:    viper.GetInt32("parade.database.max_idle_connections"),
-		ConnectionMaxLifetime: viper.GetDuration("parade.database.connection_max_lifetime"),
-	}
-}
-
 func (c *Config) GetCatalogerCatalogParams() catalogparams.Catalog {
 	return catalogparams.Catalog{
 		BatchRead: catalogparams.BatchRead{