Skip to content

Conversation

@ewolinetz
Copy link
Contributor

Also updating reconcile loop to update the primary shard for index templates to ensure it accurately is reflected for new indices that are created.

Addresses https://bugzilla.redhat.com/show_bug.cgi?id=1883444

@openshift-ci-robot openshift-ci-robot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Sep 29, 2020
@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Sep 29, 2020
@ewolinetz ewolinetz requested review from blockloop, jcantrill and periklis and removed request for alanconway and igor-karpukhin September 29, 2020 20:16
Copy link
Contributor

@jcantrill jcantrill left a comment

Choose a reason for hiding this comment

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

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Sep 29, 2020
@openshift-ci-robot openshift-ci-robot removed the lgtm Indicates that a PR is ready to be merged. label Sep 29, 2020
@ewolinetz ewolinetz changed the title [WIP] capping primary shard count at 5 for performance reasons Bug 1883444: capping primary shard count at 5 for performance reasons Sep 29, 2020
@openshift-ci-robot openshift-ci-robot added bugzilla/severity-high Referenced Bugzilla bug's severity is high for the branch this PR is targeting. and removed do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. labels Sep 29, 2020
@openshift-ci-robot
Copy link

@ewolinetz: This pull request references Bugzilla bug 1883444, which is invalid:

  • expected the bug to target the "4.6.0" release, but it targets "4.7.0" 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 1883444: capping primary shard count at 5 for performance reasons

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 the bugzilla/invalid-bug Indicates that a referenced Bugzilla bug is invalid for the branch this PR is targeting. label Sep 29, 2020
Copy link
Contributor

@periklis periklis left a comment

Choose a reason for hiding this comment

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

LGTM, one optional suggestion to limit map[string]interface{} usage.

@ewolinetz
Copy link
Contributor Author

/hold

@openshift-ci-robot openshift-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Sep 30, 2020
@ewolinetz
Copy link
Contributor Author

/retest

…e the primary shard for index templates to ensure it accurately is reflected for new indices that are created
@blockloop
Copy link
Contributor

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Oct 1, 2020
@openshift-ci-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

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

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

@alanconway
Copy link
Contributor

/uncc @alanconway

@ewolinetz
Copy link
Contributor Author

/retest
/bugzilla refresh

@openshift-ci-robot openshift-ci-robot added the bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. label Oct 5, 2020
@openshift-ci-robot
Copy link

@ewolinetz: This pull request references Bugzilla bug 1883444, which is valid. The bug has been moved to the POST state. The bug has been updated to refer to the pull request using the external bug tracker.

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target release (4.7.0) matches configured target release for branch (4.7.0)
  • bug is in the state ASSIGNED, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)

In response to this:

/retest
/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 removed the bugzilla/invalid-bug Indicates that a referenced Bugzilla bug is invalid for the branch this PR is targeting. label Oct 5, 2020
@ewolinetz
Copy link
Contributor Author

/hold cancel

@openshift-ci-robot openshift-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Oct 5, 2020
@ewolinetz
Copy link
Contributor Author

/retest

@openshift-bot
Copy link
Contributor

/retest

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

1 similar comment
@openshift-bot
Copy link
Contributor

/retest

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

@openshift-merge-robot openshift-merge-robot merged commit d4ca22a into openshift:master Oct 6, 2020
@openshift-ci-robot
Copy link

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

Bugzilla bug 1883444 has been moved to the MODIFIED state.

In response to this:

Bug 1883444: capping primary shard count at 5 for performance reasons

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.

@ewolinetz
Copy link
Contributor Author

/cherry-pick release-4.5

@openshift-cherrypick-robot

@ewolinetz: #505 failed to apply on top of branch "release-4.5":

Applying: capping primary shard count at 5 and updating reconcile loop to update the primary shard for index templates to ensure it accurately is reflected for new indices that are created
Using index info to reconstruct a base tree...
M	pkg/elasticsearch/client.go
M	pkg/elasticsearch/replicas.go
M	pkg/elasticsearch/templates.go
M	pkg/k8shandler/cluster.go
M	pkg/k8shandler/configmaps.go
M	pkg/k8shandler/configuration_tmpl.go
M	pkg/k8shandler/defaults.go
A	pkg/k8shandler/elasticsearch.go
M	test/utils/utils.go
Falling back to patching base and 3-way merge...
Auto-merging test/utils/utils.go
CONFLICT (content): Merge conflict in test/utils/utils.go
CONFLICT (modify/delete): pkg/k8shandler/elasticsearch.go deleted in HEAD and modified in capping primary shard count at 5 and updating reconcile loop to update the primary shard for index templates to ensure it accurately is reflected for new indices that are created. Version capping primary shard count at 5 and updating reconcile loop to update the primary shard for index templates to ensure it accurately is reflected for new indices that are created of pkg/k8shandler/elasticsearch.go left in tree.
Auto-merging pkg/k8shandler/defaults.go
Auto-merging pkg/k8shandler/configuration_tmpl.go
Auto-merging pkg/k8shandler/configmaps.go
Auto-merging pkg/k8shandler/cluster.go
CONFLICT (content): Merge conflict in pkg/k8shandler/cluster.go
Auto-merging pkg/elasticsearch/templates.go
CONFLICT (content): Merge conflict in pkg/elasticsearch/templates.go
Auto-merging pkg/elasticsearch/replicas.go
CONFLICT (content): Merge conflict in pkg/elasticsearch/replicas.go
Auto-merging pkg/elasticsearch/client.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 capping primary shard count at 5 and updating reconcile loop to update the primary shard for index templates to ensure it accurately is reflected for new indices that are created
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:

/cherry-pick 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.

@ewolinetz
Copy link
Contributor Author

/cherry-pick release-4.6

@openshift-cherrypick-robot

@ewolinetz: new pull request created: #515

In response to this:

/cherry-pick release-4.6

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. lgtm Indicates that a PR is ready to be merged.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

9 participants