Skip to content
New issue

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

#

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

Already on GitHub? # to your account

Jump to bottom

Use es-rollover golang implementation #3258

Merged
merged 6 commits into from
Sep 13, 2021
Merged

Use es-rollover golang implementation #3258

merged 6 commits into from
Sep 13, 2021

Conversation

rubenvp8510
Copy link
Contributor

Signed-off-by: Ruben Vargas ruben.vp8510@gmail.com

Updates #3179

@rubenvp8510 rubenvp8510 requested a review from a team as a code owner September 10, 2021 03:45
@codecov
Copy link

codecov bot commented Sep 10, 2021 •
edited
Loading

Codecov Report

Merging #3258 (eac1a7f) into master (17da056) will increase coverage by 0.04%.
The diff coverage is 100.00%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #3258      +/-   ##
==========================================
+ Coverage   95.79%   95.84%   +0.04%     
==========================================
  Files         259      259              
  Lines       15398    15408      +10     
==========================================
+ Hits        14751    14768      +17     
+ Misses        556      551       -5     
+ Partials       91       89       -2
Impacted Files Coverage Δ
cmd/es-rollover/app/flags.go 100.00% <100.00%> (ø)
cmd/es-rollover/app/index_options.go 100.00% <100.00%> (ø)
cmd/es-rollover/app/init/action.go 93.75% <100.00%> (ø)
cmd/es-rollover/app/rollover/action.go 100.00% <100.00%> (ø)
plugin/storage/integration/integration.go 78.88% <0.00%> (-0.40%) ⬇️
cmd/query/app/server.go 95.58% <0.00%> (+1.47%) ⬆️
cmd/collector/app/server/zipkin.go 70.73% <0.00%> (+12.19%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 17da056...eac1a7f. Read the comment docs.

yurishkuro
yurishkuro reviewed Sep 10, 2021
View reviewed changes
yurishkuro
yurishkuro reviewed Sep 10, 2021
View reviewed changes
@yurishkuro
Copy link
Member

are the CLI flags in the new image compatible with the old python script?

@pavolloffay
Copy link
Member

The CI didn't pass

@rubenvp8510
Use es-rollover golang implementation
dbe6749 
Signed-off-by: Ruben Vargas <ruben.vp8510@gmail.com>
@rubenvp8510 rubenvp8510 force-pushed the rollover-docker branch 2 times, most recently from 077e048 to 67d8e7e Compare September 11, 2021 17:50
@rubenvp8510 rubenvp8510 changed the title Use es-rollover golang implementation [WIP] Use es-rollover golang implementation Sep 11, 2021
@rubenvp8510
Some es-rollover fixes
c07846b 
Signed-off-by: Ruben Vargas <ruben.vp8510@gmail.com>
@rubenvp8510
Fix docker build
2f2b644 
Signed-off-by: Ruben Vargas <ruben.vp8510@gmail.com>
@rubenvp8510
Increase coverage of rollover action
9baf766 
Signed-off-by: Ruben Vargas <ruben.vp8510@gmail.com>
@rubenvp8510
Git ignore es-rollover and es-index-cleaner binaries
81932d7 
Signed-off-by: Ruben Vargas <ruben.vp8510@gmail.com>
@rubenvp8510 rubenvp8510 changed the title [WIP] Use es-rollover golang implementation Use es-rollover golang implementation Sep 11, 2021
pavolloffay
pavolloffay previously approved these changes Sep 13, 2021
View reviewed changes
cmd/es-rollover/app/index_options_test.go
@@ -61,7 +61,7 @@ func TestRolloverIndices(t *testing.T) {
expected: []expectedValues{
{
prefix: "mytenant-jaeger-span-archive",
templateName: "mytenant-jaeger-span",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why is this changing? Shouldn't the template name keep the prefix name?

The new golang implementation has to be backwards compatible.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I shouldn't

https://github.com/jaegertracing/jaeger/pull/3258/files#diff-59567de3853ac61d1a7460823020ee5c2fe7680353df87011f4cd1df1b132f45L83

Look as this calls, the template has no prefix. It was my mistake to include the prefix in the first PR for this.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

wait. I see one mistake , don't merge this please.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed, you're right, the template name should be prefixed, the mapping name used to build the template should not.

@pavolloffay
Copy link
Member

are the CLI flags in the new image compatible with the old python script?

Yes this is the goal

@rubenvp8510
Prefix template name, but not mapping name
eac1a7f 
Signed-off-by: Ruben Vargas <ruben.vp8510@gmail.com>
@pavolloffay pavolloffay merged commit 5ea0d8f into jaegertracing:master Sep 13, 2021
@joe-elliott joe-elliott added this to the v1.27.0 milestone Oct 6, 2021
# for free to join this conversation on GitHub. Already have an account? # to comment
Reviewers

@yurishkuro yurishkuro yurishkuro left review comments

@pavolloffay pavolloffay pavolloffay approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
v1.27.0
Development

Successfully merging this pull request may close these issues.
4 participants
@rubenvp8510 @yurishkuro @pavolloffay @joe-elliott