Skip to content

server: init external storage before SQL start #160040

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dt wants to merge 1 commit into
base: master
Choose a base branch
from
+20 −20
Open

server: init external storage before SQL start #160040

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 20 additions & 20 deletions pkg/server/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2137,6 +2137,26 @@ func (s *topLevelServer) PreStart(ctx context.Context) error {
// executes a SQL query, this must be done after the SQL layer is ready.
s.node.recordJoinEvent(ctx)

// Initialize the external storage builders configuration params now that the
// engines have been created. The object can be used to create ExternalStorage
// objects hereafter.
ieMon := sql.MakeInternalExecutorMemMonitor(sql.MemoryMetrics{}, s.ClusterSettings())
ieMon.StartNoReserved(ctx, s.PGServer().SQLServer.GetBytesMonitor())
s.stopper.AddCloser(stop.CloserFn(func() { ieMon.Stop(ctx) }))
s.externalStorageBuilder.init(
s.cfg.EarlyBootExternalStorageAccessor,
s.cfg.ExternalIODirConfig,
s.st,
s.sqlServer.sqlIDContainer,
s.kvNodeDialer,
s.cfg.TestingKnobs,
true, /* allowLocalFastPath */
s.sqlServer.execCfg.InternalDB.CloneWithMemoryMonitor(sql.MemoryMetrics{}, ieMon),
nil, /* TenantExternalIORecorder */
s.appRegistry,
s.cfg.ExternalIODir,
)

if !s.cfg.DisableSQLServer {
// Start the SQL subsystem.
if err := s.sqlServer.preStart(
Expand Down Expand Up @@ -2199,26 +2219,6 @@ func (s *topLevelServer) PreStart(ctx context.Context) error {
return err
}

// Initialize the external storage builders configuration params now that the
// engines have been created. The object can be used to create ExternalStorage
// objects hereafter.
ieMon := sql.MakeInternalExecutorMemMonitor(sql.MemoryMetrics{}, s.ClusterSettings())
ieMon.StartNoReserved(ctx, s.PGServer().SQLServer.GetBytesMonitor())
s.stopper.AddCloser(stop.CloserFn(func() { ieMon.Stop(ctx) }))
s.externalStorageBuilder.init(
s.cfg.EarlyBootExternalStorageAccessor,
s.cfg.ExternalIODirConfig,
s.st,
s.sqlServer.sqlIDContainer,
s.kvNodeDialer,
s.cfg.TestingKnobs,
true, /* allowLocalFastPath */
s.sqlServer.execCfg.InternalDB.CloneWithMemoryMonitor(sql.MemoryMetrics{}, ieMon),
nil, /* TenantExternalIORecorder */
s.appRegistry,
s.cfg.ExternalIODir,
)

if err := s.runIdempontentSQLForInitType(ctx, state.initType); err != nil {
return err
}
Expand Down
Loading