pack: skip unavailable configs from etcd and tcs #1066

patapenka-alexey · 2024-12-16T14:05:55Z

Closes #1038

@TarantoolBot document
Title: pack: skip unavailable configs from etcd and tcs

This patch fixes the tt pack error if etcd or tcs are unavailable during package creation.

test/integration/pack/test_bundles/vshard_app/test_app/router.lua

cli/running/running.go

oleg-jukovec

Please, add an entry into CHANGELOG.md.

elhimov · 2024-12-18T17:45:04Z

cli/pack/opts.go

@@ -49,7 +49,7 @@ func initAppsInfo(cliOpts *config.CliOpts, cmdCtx *cmdcontext.CmdCtx, packCtx *P
 	}
 	packCtx.AppList = appList
 	packCtx.AppsInfo, err = running.CollectInstancesForApps(packCtx.AppList, cliOpts,
-		cmdCtx.Cli.ConfigDir, cmdCtx.Integrity, true)
+		cmdCtx.Cli.ConfigDir, cmdCtx.Integrity, false)


It looks like the same approach is to be applied to both instances scripts and cluster config. So both of them are required or both of them are optional and it seems wrong in case of tt pack. I'm not sure about cluster config, maybe it's correct that we treat it as configuration and thus able to drop from package, but it seems we are not able to treat instances scripts in the same way because they contain business logic and thus look like the essential part of the package.

And regardless of our ability to drop some part of package while preparing it, it looks quite weird that content of the package depends on current availability of some items. What if next time one pack the same application but etcd/tcs config is available? As the content is changed we will get another package for the same application. Do we expect such a behavior?

test/integration/pack/test_pack.py

CHANGELOG.md

cli/cmd/replicaset.go

cli/running/running.go

oleg-jukovec

We still not skip a config load, but load a config and skip an error.

oleg-jukovec

You still tries to load the config even ConfigLoadSkip == true.

cli/running/running_test.go

cli/running/running.go

oleg-jukovec

Ok, let's merge it now. And left the proper code for the future refactoring. Please, update tests (see a comment above).

cli/running/running_test.go

oleg-jukovec · 2025-01-16T22:38:23Z

Please, rebase on the master branch to fix the CI.

cli/pack/opts.go

@TarantoolBot

@TarantoolBot document Title: pack: skip configs from etcd and tcs This patch fixes the `tt pack` error if `etcd` or `tcs` are unavailable during package creation. Part of #1038

oleg-jukovec · 2025-01-17T13:52:56Z

cli/running/running.go

@@ -126,6 +126,21 @@ type providerImpl struct {
 	instanceCtx *InstanceCtx
 }

+type ConfigLoad int


Comment missed.

elhimov

Thanks for the patch! LGTM.

From now on `build`, `completion`, `kill`, `log`, `logrotate`, `stop`, `list`, `pack` commands skip instance config generation from local, etcs/tcs and env sources. Closes #1038

patapenka-alexey changed the title ~~pack: skip configs from etcd and tcs~~ pack: skip unavailable configs from etcd and tcs Dec 16, 2024

patapenka-alexey force-pushed the patapenka-alexey/gh-1038-tt-pack-error-etcd branch from ddf6386 to c75c205 Compare December 16, 2024 14:07

patapenka-alexey requested review from elhimov and oleg-jukovec December 16, 2024 14:27

tecl1s reviewed Dec 17, 2024

View reviewed changes

test/integration/pack/test_bundles/vshard_app/test_app/router.lua Show resolved Hide resolved

oleg-jukovec reviewed Dec 17, 2024

View reviewed changes

cli/running/running.go Outdated Show resolved Hide resolved

oleg-jukovec reviewed Dec 17, 2024

View reviewed changes

elhimov reviewed Dec 18, 2024

View reviewed changes

patapenka-alexey mentioned this pull request Dec 23, 2024

tt create vshard_cluster command generate incorrect router role #1071

Open

patapenka-alexey force-pushed the patapenka-alexey/gh-1038-tt-pack-error-etcd branch from c75c205 to 7b9cd77 Compare December 23, 2024 07:55

dmyger reviewed Dec 23, 2024

View reviewed changes

test/integration/pack/test_pack.py Outdated Show resolved Hide resolved

test/integration/pack/test_pack.py Outdated Show resolved Hide resolved

patapenka-alexey force-pushed the patapenka-alexey/gh-1038-tt-pack-error-etcd branch 3 times, most recently from 30ff7e3 to b64c71a Compare December 23, 2024 13:15

oleg-jukovec added the full-ci Enables full ci tests label Dec 23, 2024

patapenka-alexey force-pushed the patapenka-alexey/gh-1038-tt-pack-error-etcd branch from b64c71a to bfb7321 Compare December 26, 2024 08:18

patapenka-alexey requested review from elhimov, dmyger and oleg-jukovec December 26, 2024 13:05

dmyger approved these changes Dec 26, 2024

View reviewed changes

oleg-jukovec requested changes Dec 27, 2024

View reviewed changes

CHANGELOG.md Outdated Show resolved Hide resolved

cli/cmd/replicaset.go Outdated Show resolved Hide resolved

cli/cmd/replicaset.go Outdated Show resolved Hide resolved

cli/running/running.go Outdated Show resolved Hide resolved

patapenka-alexey force-pushed the patapenka-alexey/gh-1038-tt-pack-error-etcd branch from bfb7321 to 460b4fa Compare December 27, 2024 12:12

patapenka-alexey requested a review from oleg-jukovec December 27, 2024 13:23

oleg-jukovec requested changes Dec 28, 2024

View reviewed changes

patapenka-alexey force-pushed the patapenka-alexey/gh-1038-tt-pack-error-etcd branch 2 times, most recently from bcefd0a to f729a21 Compare January 3, 2025 12:12

patapenka-alexey force-pushed the patapenka-alexey/gh-1038-tt-pack-error-etcd branch from f729a21 to 48559b6 Compare January 8, 2025 11:06

patapenka-alexey removed the full-ci Enables full ci tests label Jan 9, 2025

patapenka-alexey force-pushed the patapenka-alexey/gh-1038-tt-pack-error-etcd branch from 48559b6 to bf7ba6c Compare January 9, 2025 11:08

patapenka-alexey marked this pull request as draft January 9, 2025 11:09

patapenka-alexey force-pushed the patapenka-alexey/gh-1038-tt-pack-error-etcd branch 3 times, most recently from 4bb9df1 to cd71f6f Compare January 15, 2025 11:09

patapenka-alexey requested review from elhimov, dmyger and oleg-jukovec January 16, 2025 05:52

oleg-jukovec requested changes Jan 16, 2025

View reviewed changes

cli/running/running_test.go Outdated Show resolved Hide resolved

cli/running/running.go Outdated Show resolved Hide resolved

oleg-jukovec approved these changes Jan 16, 2025

View reviewed changes

dmyger approved these changes Jan 16, 2025

View reviewed changes

patapenka-alexey force-pushed the patapenka-alexey/gh-1038-tt-pack-error-etcd branch 2 times, most recently from 41dc8f2 to 6c0c5f6 Compare January 16, 2025 11:48

oleg-jukovec reviewed Jan 16, 2025

View reviewed changes

cli/running/running_test.go Outdated Show resolved Hide resolved

cli/running/running_test.go Show resolved Hide resolved

patapenka-alexey force-pushed the patapenka-alexey/gh-1038-tt-pack-error-etcd branch 2 times, most recently from e606a21 to 808a902 Compare January 17, 2025 07:39

patapenka-alexey requested a review from oleg-jukovec January 17, 2025 09:45

elhimov reviewed Jan 17, 2025

View reviewed changes

cli/pack/opts.go Outdated Show resolved Hide resolved

oleg-jukovec approved these changes Jan 17, 2025

View reviewed changes

pack: skip unavailable configs from etcd and tcs

767a0c3

@TarantoolBot document Title: pack: skip configs from etcd and tcs This patch fixes the `tt pack` error if `etcd` or `tcs` are unavailable during package creation. Part of #1038

patapenka-alexey force-pushed the patapenka-alexey/gh-1038-tt-pack-error-etcd branch from 808a902 to 3328b6e Compare January 17, 2025 10:40

patapenka-alexey requested review from elhimov and oleg-jukovec January 17, 2025 11:54

oleg-jukovec approved these changes Jan 17, 2025

View reviewed changes

oleg-jukovec reviewed Jan 17, 2025

View reviewed changes

elhimov approved these changes Jan 17, 2025

View reviewed changes

cli: skip cluster config for the few commands

0845d96

From now on `build`, `completion`, `kill`, `log`, `logrotate`, `stop`, `list`, `pack` commands skip instance config generation from local, etcs/tcs and env sources. Closes #1038

patapenka-alexey force-pushed the patapenka-alexey/gh-1038-tt-pack-error-etcd branch from 3328b6e to 0845d96 Compare January 17, 2025 14:30

oleg-jukovec merged commit 0d17f18 into master Jan 20, 2025
24 checks passed

oleg-jukovec deleted the patapenka-alexey/gh-1038-tt-pack-error-etcd branch January 20, 2025 10:05

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

pack: skip unavailable configs from etcd and tcs #1066

pack: skip unavailable configs from etcd and tcs #1066

patapenka-alexey commented Dec 16, 2024 •

edited

Loading

oleg-jukovec left a comment

elhimov Dec 18, 2024 •

edited

Loading

elhimov Dec 19, 2024

oleg-jukovec left a comment

oleg-jukovec left a comment •

edited

Loading

oleg-jukovec left a comment •

edited

Loading

oleg-jukovec commented Jan 16, 2025

oleg-jukovec Jan 17, 2025 •

edited

Loading

elhimov left a comment

pack: skip unavailable configs from etcd and tcs #1066

pack: skip unavailable configs from etcd and tcs #1066

Conversation

patapenka-alexey commented Dec 16, 2024 • edited Loading

oleg-jukovec left a comment

Choose a reason for hiding this comment

elhimov Dec 18, 2024 • edited Loading

Choose a reason for hiding this comment

elhimov Dec 19, 2024

Choose a reason for hiding this comment

oleg-jukovec left a comment

Choose a reason for hiding this comment

oleg-jukovec left a comment • edited Loading

Choose a reason for hiding this comment

oleg-jukovec left a comment • edited Loading

Choose a reason for hiding this comment

oleg-jukovec commented Jan 16, 2025

oleg-jukovec Jan 17, 2025 • edited Loading

Choose a reason for hiding this comment

elhimov left a comment

Choose a reason for hiding this comment

patapenka-alexey commented Dec 16, 2024 •

edited

Loading

elhimov Dec 18, 2024 •

edited

Loading

oleg-jukovec left a comment •

edited

Loading

oleg-jukovec left a comment •

edited

Loading

oleg-jukovec Jan 17, 2025 •

edited

Loading