fix(cmd,lockfile): bd-6dnrw.44 P3s — proxied store-factory errors, init provider lifecycle, errors.Is
- store_factory(+nocgo): replace the raw 'proxy server store should be uow provider' TODO strings (reachable cross-repo via hydration/routing into a proxied workspace) with a real error naming the workspace and the constraint; drop the dead commented newProxiedServerStore calls. - init_proxied_server: stop shadowing the package-global uowProvider and close the provider when init returns (was never closed). - lockfile.IsLocked: errors.Is instead of pointer equality so wrapped errProcessLocked still matches. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
This commit is contained in:
parent
341c7a5a47
commit
1a83cb08c2
4 changed files with 21 additions and 33 deletions
|
|
@ -144,12 +144,15 @@ func runInitProxiedServer(cmd *cobra.Command, ctx context.Context, in initProxie
|
|||
fmt.Fprintf(os.Stderr, "Warning: failed to initialize version tracking: %v\n", fsResult.LocalVersionErr)
|
||||
}
|
||||
|
||||
uowProvider, err := newProxiedServerUOWProvider(ctx, beadsDir)
|
||||
// Deliberately a local, not the package-global uowProvider: init owns this
|
||||
// provider's whole lifecycle and closes it before the tail runs.
|
||||
provider, err := newProxiedServerUOWProvider(ctx, beadsDir)
|
||||
if err != nil {
|
||||
FatalError("failed to open uow provider: %v", err)
|
||||
}
|
||||
defer func() { _ = provider.Close(ctx) }()
|
||||
|
||||
uw, err := uowProvider.NewUOW(ctx)
|
||||
uw, err := provider.NewUOW(ctx)
|
||||
if err != nil {
|
||||
FatalError("failed to open unit of work: %v", err)
|
||||
}
|
||||
|
|
|
|||
|
|
@ -93,13 +93,11 @@ func acquireEmbeddedLock(beadsDir string, serverMode bool) (util.Unlocker, error
|
|||
func newDoltStoreFromConfig(ctx context.Context, beadsDir string) (storage.DoltStorage, error) {
|
||||
cfg, err := configfile.Load(beadsDir)
|
||||
if err == nil && cfg != nil && cfg.IsDoltProxiedServerMode() {
|
||||
// TODO: this needs to be uow provider
|
||||
return nil, fmt.Errorf("proxy server store should be uow provider")
|
||||
// return newProxiedServerStore(ctx, &dolt.Config{
|
||||
// BeadsDir: beadsDir,
|
||||
// Database: cfg.GetDoltDatabase(),
|
||||
// ProxiedServer: true,
|
||||
// })
|
||||
// Proxied-server workspaces have no classic store backend; they are
|
||||
// served through the UOW provider (newProxiedServerUOWProvider) by
|
||||
// commands with a proxied dispatch path. Reachable cross-repo, e.g.
|
||||
// when hydration or routing opens a foreign proxied workspace.
|
||||
return nil, fmt.Errorf("workspace %s uses dolt proxied-server mode, which cannot be opened as a classic store; only commands with proxied-server support can use it", beadsDir)
|
||||
}
|
||||
if err == nil && cfg != nil && cfg.IsDoltServerMode() {
|
||||
return dolt.NewFromConfig(ctx, beadsDir)
|
||||
|
|
@ -166,14 +164,9 @@ func migrateHyphenatedDB(beadsDir string, cfg *configfile.Config, oldName, newNa
|
|||
func newReadOnlyStoreFromConfig(ctx context.Context, beadsDir string) (storage.DoltStorage, error) {
|
||||
cfg, err := configfile.Load(beadsDir)
|
||||
if err == nil && cfg != nil && cfg.IsDoltProxiedServerMode() {
|
||||
// TODO: this needs to be uow provider
|
||||
return nil, fmt.Errorf("proxy server store needs to be uow provider")
|
||||
// return newProxiedServerStore(ctx, &dolt.Config{
|
||||
// BeadsDir: beadsDir,
|
||||
// Database: cfg.GetDoltDatabase(),
|
||||
// ProxiedServer: true,
|
||||
// ReadOnly: true,
|
||||
// })
|
||||
// Proxied-server workspaces have no classic store backend (see
|
||||
// newDoltStoreFromConfig); read-only cross-repo opens hit this too.
|
||||
return nil, fmt.Errorf("workspace %s uses dolt proxied-server mode, which cannot be opened as a classic store; only commands with proxied-server support can use it", beadsDir)
|
||||
}
|
||||
if err == nil && cfg != nil && cfg.IsDoltServerMode() {
|
||||
return dolt.NewFromConfigWithOptions(ctx, beadsDir, &dolt.Config{ReadOnly: true})
|
||||
|
|
|
|||
|
|
@ -49,13 +49,10 @@ func acquireEmbeddedLock(_ string, _ bool) (util.Unlocker, error) {
|
|||
func newDoltStoreFromConfig(ctx context.Context, beadsDir string) (storage.DoltStorage, error) {
|
||||
cfg, err := configfile.Load(beadsDir)
|
||||
if err == nil && cfg != nil && cfg.IsDoltProxiedServerMode() {
|
||||
// TODO: this needs to be uow provider
|
||||
return nil, fmt.Errorf("proxy server store should be uow provider")
|
||||
// return newProxiedServerStore(ctx, &dolt.Config{
|
||||
// BeadsDir: beadsDir,
|
||||
// Database: cfg.GetDoltDatabase(),
|
||||
// ProxiedServer: true,
|
||||
// })
|
||||
// Proxied-server workspaces have no classic store backend; they are
|
||||
// served through the UOW provider by commands with a proxied
|
||||
// dispatch path.
|
||||
return nil, fmt.Errorf("workspace %s uses dolt proxied-server mode, which cannot be opened as a classic store; only commands with proxied-server support can use it", beadsDir)
|
||||
}
|
||||
if err == nil && cfg != nil && cfg.IsDoltServerMode() {
|
||||
return dolt.NewFromConfig(ctx, beadsDir)
|
||||
|
|
@ -67,14 +64,9 @@ func newDoltStoreFromConfig(ctx context.Context, beadsDir string) (storage.DoltS
|
|||
func newReadOnlyStoreFromConfig(ctx context.Context, beadsDir string) (storage.DoltStorage, error) {
|
||||
cfg, err := configfile.Load(beadsDir)
|
||||
if err == nil && cfg != nil && cfg.IsDoltProxiedServerMode() {
|
||||
// TODO: this needs to be uow provider
|
||||
return nil, fmt.Errorf("proxy server store needs to be uow provider")
|
||||
// return newProxiedServerStore(ctx, &dolt.Config{
|
||||
// BeadsDir: beadsDir,
|
||||
// Database: cfg.GetDoltDatabase(),
|
||||
// ProxiedServer: true,
|
||||
// ReadOnly: true,
|
||||
// })
|
||||
// Proxied-server workspaces have no classic store backend (see
|
||||
// newDoltStoreFromConfig); read-only cross-repo opens hit this too.
|
||||
return nil, fmt.Errorf("workspace %s uses dolt proxied-server mode, which cannot be opened as a classic store; only commands with proxied-server support can use it", beadsDir)
|
||||
}
|
||||
if err == nil && cfg != nil && cfg.IsDoltServerMode() {
|
||||
return dolt.NewFromConfigWithOptions(ctx, beadsDir, &dolt.Config{ReadOnly: true})
|
||||
|
|
|
|||
|
|
@ -13,5 +13,5 @@ var ErrLockBusy = errors.New("lock busy: held by another process")
|
|||
|
||||
// IsLocked returns true if the error indicates a lock is held by another process.
|
||||
func IsLocked(err error) bool {
|
||||
return err == errProcessLocked
|
||||
return errors.Is(err, errProcessLocked)
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue