Skip to content
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.

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

Bug 1916910: Condense indexmanagement into single cronjob #627

Merged
merged 1 commit into from
Jan 27, 2021

Conversation

jcantrill
Copy link
Contributor

(cherry picked from commit c7079ed)

Description

This PR collapses the multiple policy cronjobs to a single job with multiple tasks it runs:

  • delete
  • rollover
  • adds simple adapter to log package to facilitate cherrypicks from post 4.6

The reasoning is there is a potential race condition between the previous jobs which both rely upon a -write alias that may lead to false information. Additionally, ES does not have transactions or is ACID. By converting these into tasks we execute for management we:

  • potentially free disk for ES to do additional work
  • give a better chance for the rollover to be successful
  • May need to add a task to "unblock" the read-only index identified in the BZ

/cc @ewolinetz

Links

4.6 backport of #599

@openshift-ci-robot openshift-ci-robot added bugzilla/severity-high Referenced Bugzilla bug's severity is high for the branch this PR is targeting. bugzilla/invalid-bug Indicates that a referenced Bugzilla bug is invalid for the branch this PR is targeting. labels Jan 15, 2021
@openshift-ci-robot
Copy link

@jcantrill: This pull request references Bugzilla bug 1916910, which is invalid:

  • expected dependent Bugzilla bug 1890838 to be in one of the following states: VERIFIED, RELEASE_PENDING, CLOSED (ERRATA), but it is ON_QA instead

Comment /bugzilla refresh to re-evaluate validity if changes to the Bugzilla bug are made, or edit the title of this pull request to link to a different bug.

In response to this:

Bug 1916910: Condense indexmanagement into single cronjob

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@jcantrill jcantrill added release/4.6 and removed bugzilla/invalid-bug Indicates that a referenced Bugzilla bug is invalid for the branch this PR is targeting. bugzilla/severity-high Referenced Bugzilla bug's severity is high for the branch this PR is targeting. labels Jan 15, 2021
@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jan 15, 2021
@ewolinetz
Copy link
Contributor

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Jan 15, 2021
@openshift-ci-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: ewolinetz, jcantrill

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:
  • OWNERS [ewolinetz,jcantrill]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@jcantrill
Copy link
Contributor Author

/bugzilla refresh

@openshift-ci-robot
Copy link

@jcantrill: This pull request references Bugzilla bug 1916910, which is valid.

6 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target release (4.6.z) matches configured target release for branch (4.6.z)
  • bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)
  • dependent bug Bugzilla bug 1890838 is in the state VERIFIED, which is one of the valid states (VERIFIED, RELEASE_PENDING, CLOSED (ERRATA))
  • dependent Bugzilla bug 1890838 targets the "4.7.0" release, which is one of the valid target releases: 4.7.0
  • bug has dependents

In response to this:

/bugzilla refresh

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@openshift-ci-robot openshift-ci-robot added bugzilla/severity-high Referenced Bugzilla bug's severity is high for the branch this PR is targeting. bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. labels Jan 21, 2021
@jwforres jwforres added the cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. label Jan 27, 2021
@openshift-merge-robot openshift-merge-robot merged commit 942dc68 into openshift:release-4.6 Jan 27, 2021
@openshift-ci-robot
Copy link

@jcantrill: All pull requests linked via external trackers have merged:

Bugzilla bug 1916910 has been moved to the MODIFIED state.

In response to this:

Bug 1916910: Condense indexmanagement into single cronjob

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@jcantrill jcantrill deleted the 1916910 branch February 12, 2021 21:59
@jcantrill
Copy link
Contributor Author

/cherrypick release-4.5

@openshift-cherrypick-robot

@jcantrill: #627 failed to apply on top of branch "release-4.5":

Applying: Bug 1916910: Condense indexmanagement into single cronjob
.git/rebase-apply/patch:380: space before tab in indent.
		 	selector := map[string]string{}
warning: 1 line adds whitespace errors.
Using index info to reconstruct a base tree...
M	pkg/indexmanagement/reconcile.go
M	pkg/k8shandler/index_management.go
A	pkg/log/log.go
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): pkg/log/log.go deleted in HEAD and modified in Bug 1916910: Condense indexmanagement into single cronjob. Version Bug 1916910: Condense indexmanagement into single cronjob of pkg/log/log.go left in tree.
Auto-merging pkg/k8shandler/index_management.go
CONFLICT (content): Merge conflict in pkg/k8shandler/index_management.go
Auto-merging pkg/indexmanagement/reconcile.go
CONFLICT (content): Merge conflict in pkg/indexmanagement/reconcile.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Bug 1916910: Condense indexmanagement into single cronjob
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherrypick release-4.5

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. bugzilla/severity-high Referenced Bugzilla bug's severity is high for the branch this PR is targeting. bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. lgtm Indicates that a PR is ready to be merged. release/4.6
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

7 participants