You are viewing a plain text version of this content. The canonical link for it is here.
Posted to issues@trafficcontrol.apache.org by GitBox <gi...@apache.org> on 2021/06/28 20:51:32 UTC
[GitHub] [trafficcontrol] shamrickus opened a new pull request #5980: Handle pageination in Riak search
shamrickus opened a new pull request #5980:
URL: https://github.com/apache/trafficcontrol/pull/5980
<!--
************ STOP!! ************
If this Pull Request is intended to fix a security vulnerability, DO NOT submit it! Instead, contact
the Apache Software Foundation Security Team at security@trafficcontrol.apache.org and follow the
guidelines at https://www.apache.org/security/ regarding vulnerability disclosure.
-->
## What does this PR (Pull Request) do?
<!-- Explain the changes you made here. If this fixes an Issue, identify it by
replacing the text in the checkbox item with the Issue number e.g.
- [x] This PR fixes #9001 OR is not related to any Issue
^ This will automatically close Issue number 9001 when the Pull Request is
merged (The '#' is important).
Be sure you check the box properly, see the "The following criteria are ALL
met by this PR" section for details.
-->
- [x] This PR fixes #5902 <!-- You can check for an issue here: https://github.com/apache/trafficcontrol/issues -->
I have written the tests for this change, but given that it takes ~8 minutes I've decided to omit it.
## Which Traffic Control components are affected by this PR?
<!-- Please delete all components from this list that are NOT affected by this
Pull Request. Also, feel free to add the name of a tool or script that is
affected but not on the list.
Additionally, if this Pull Request does NOT affect documentation, please
explain why documentation is not required. -->
- Traffic Ops
- Traffic Vault
## What is the best way to verify this PR?
Create >1000 DS with sslkeys on a single cdn, call `cdns/name/{name}/sslkeys` and verify it returns more than 1000 records.
Create >1000 SSLKeys on a single CDN (doesn't matter if it's one or many DS'), then make a change (such as moving a DS to another CDN) that modifies more than 1000 ssl certs on a cdn. Finally, perform a snapshot. Only 1000 of the SSLKey records will have been removed/updated.
The order in which these are returned is transient as far as I can tell, so which 1000 changes.
<!-- Please include here ALL the steps necessary to test your Pull Request. If
it includes tests (and most should), outline here the steps needed to run the
tests. If not, lay out the manual testing procedure and please explain why
tests are unnecessary for this Pull Request. -->
## If this is a bug fix, what versions of Traffic Control are affected?
<!-- If this PR fixes a bug, please list here all of the affected versions - to
the best of your knowledge. It's also pretty helpful to include a commit hash
of where 'master' is at the time this PR is opened (if it affects master),
because what 'master' means will change over time. For example, if this PR
fixes a bug that's present in master (at commit hash '1df853c8'), in v4.0.0,
and in the current 4.0.1 Release candidate (e.g. RC1), then this list would
look like:
- master (1df853c8)
- 4.0.0
- 4.0.1 (RC1)
If you don't know what other versions might have this bug, AND don't know how
to find the commit hash of 'master', then feel free to leave this section
blank (or, preferably, delete it entirely).
-->
- every version
## The following criteria are ALL met by this PR
<!-- Check the boxes to signify that the associated statement is true. To
"check a box", replace the space inside of the square brackets with an 'x'.
e.g.
- [ x] <- Wrong
- [x ] <- Wrong
- [] <- Wrong
- [*] <- Wrong
- [x] <- Correct!
-->
- [ ] This PR includes tests OR I have explained why tests are unnecessary
- [ ] This PR includes documentation OR I have explained why documentation is unnecessary
- [ ] This PR includes an update to CHANGELOG.md OR such an update is not necessary
- [ ] This PR includes any and all required license headers
- [ ] This PR **DOES NOT FIX A SERIOUS SECURITY VULNERABILITY** (see [the Apache Software Foundation's security guidelines](https://www.apache.org/security/) for details)
## Additional Information
<!-- If you would like to include any additional information on the PR for
potential reviewers please put it here.
Some examples of this would be:
- Before and after screenshots/gifs of the Traffic Portal if it is affected
- Links to other dependent Pull Requests
- References to relevant context (e.g. new/updates to dependent libraries,
mailing list records, blueprints)
Feel free to leave this section blank (or, preferably, delete it entirely).
-->
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
distributed with this work for additional information
regarding copyright ownership. The ASF licenses this file
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@trafficcontrol.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [trafficcontrol] mattjackson220 merged pull request #5980: Handle pageination in Riak search
Posted by GitBox <gi...@apache.org>.
mattjackson220 merged pull request #5980:
URL: https://github.com/apache/trafficcontrol/pull/5980
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@trafficcontrol.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [trafficcontrol] mattjackson220 commented on a change in pull request #5980: Handle pageination in Riak search
Posted by GitBox <gi...@apache.org>.
mattjackson220 commented on a change in pull request #5980:
URL: https://github.com/apache/trafficcontrol/pull/5980#discussion_r662550344
##########
File path: traffic_ops/traffic_ops_golang/trafficvault/backends/riaksvc/riak_services.go
##########
@@ -394,31 +394,54 @@ func withCluster(tx *sql.Tx, authOpts *riak.AuthOptions, riakPort *uint, f func(
// search searches Riak for the given query. Returns nil and a nil error if no object was found.
// If fields is empty, all fields will be returned.
-func search(cluster StorageCluster, index string, query string, filterQuery string, numRows int, fields []string) ([]*riak.SearchDoc, error) {
- riakCmd := riak.NewSearchCommandBuilder().
- WithIndexName(index).
- WithQuery(query).
- WithNumRows(uint32(numRows))
- if len(filterQuery) > 0 {
- riakCmd = riakCmd.WithFilterQuery(filterQuery)
- }
- if len(fields) > 0 {
- riakCmd = riakCmd.WithReturnFields(fields...)
- }
- iCmd, err := riakCmd.Build()
+func search(cluster StorageCluster, index string, query string, filterQuery string, numRows uint32, fields []string) ([]*riak.SearchDoc, error) {
+ var searchDocs []*riak.SearchDoc
+ for start := uint32(0); ; start += numRows {
+ riakCmd := riak.NewSearchCommandBuilder().
+ WithIndexName(index).
+ WithQuery(query).
+ WithNumRows(numRows).
+ WithStart(start)
+ if len(filterQuery) > 0 {
+ riakCmd = riakCmd.WithFilterQuery(filterQuery)
+ }
+ if len(fields) > 0 {
+ riakCmd = riakCmd.WithReturnFields(fields...)
+ }
+ iCmd, err := riakCmd.Build()
- if err != nil {
- return nil, errors.New("building Riak command: " + err.Error())
- }
- if err = cluster.Execute(iCmd); err != nil {
- return nil, errors.New("executing Riak command index '" + index + "' query '" + query + "': " + err.Error())
- }
- cmd, ok := iCmd.(*riak.SearchCommand)
- if !ok {
- return nil, fmt.Errorf("Riak command unexpected type %T", iCmd)
- }
- if cmd.Response == nil || cmd.Response.NumFound == 0 {
- return nil, nil
+ if err != nil {
+ return nil, errors.New("building Riak command: " + err.Error())
+ }
+ if err = cluster.Execute(iCmd); err != nil {
+ return nil, errors.New("executing Riak command index '" + index + "' query '" + query + "': " + err.Error())
+ }
+ cmd, ok := iCmd.(*riak.SearchCommand)
+ if !ok {
+ return nil, fmt.Errorf("riak command unexpected type %T", iCmd)
+ }
+ if cmd.Response == nil {
+ return nil, fmt.Errorf("riak recieved nil responce")
Review comment:
spelling x2 ("received" and "response" )
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@trafficcontrol.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [trafficcontrol] ocket8888 commented on pull request #5980: Handle pageination in Riak search
Posted by GitBox <gi...@apache.org>.
ocket8888 commented on pull request #5980:
URL: https://github.com/apache/trafficcontrol/pull/5980#issuecomment-876750332
TO Go client/API integration tests will pass if you rebase
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@trafficcontrol.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [trafficcontrol] shamrickus commented on a change in pull request #5980: Handle pageination in Riak search
Posted by GitBox <gi...@apache.org>.
shamrickus commented on a change in pull request #5980:
URL: https://github.com/apache/trafficcontrol/pull/5980#discussion_r665326023
##########
File path: traffic_ops/traffic_ops_golang/trafficvault/backends/riaksvc/riak_services.go
##########
@@ -394,31 +394,54 @@ func withCluster(tx *sql.Tx, authOpts *riak.AuthOptions, riakPort *uint, f func(
// search searches Riak for the given query. Returns nil and a nil error if no object was found.
// If fields is empty, all fields will be returned.
-func search(cluster StorageCluster, index string, query string, filterQuery string, numRows int, fields []string) ([]*riak.SearchDoc, error) {
- riakCmd := riak.NewSearchCommandBuilder().
- WithIndexName(index).
- WithQuery(query).
- WithNumRows(uint32(numRows))
- if len(filterQuery) > 0 {
- riakCmd = riakCmd.WithFilterQuery(filterQuery)
- }
- if len(fields) > 0 {
- riakCmd = riakCmd.WithReturnFields(fields...)
- }
- iCmd, err := riakCmd.Build()
+func search(cluster StorageCluster, index string, query string, filterQuery string, numRows uint32, fields []string) ([]*riak.SearchDoc, error) {
+ var searchDocs []*riak.SearchDoc
+ for start := uint32(0); ; start += numRows {
+ riakCmd := riak.NewSearchCommandBuilder().
+ WithIndexName(index).
+ WithQuery(query).
+ WithNumRows(numRows).
+ WithStart(start)
+ if len(filterQuery) > 0 {
+ riakCmd = riakCmd.WithFilterQuery(filterQuery)
+ }
+ if len(fields) > 0 {
+ riakCmd = riakCmd.WithReturnFields(fields...)
+ }
+ iCmd, err := riakCmd.Build()
- if err != nil {
- return nil, errors.New("building Riak command: " + err.Error())
- }
- if err = cluster.Execute(iCmd); err != nil {
- return nil, errors.New("executing Riak command index '" + index + "' query '" + query + "': " + err.Error())
- }
- cmd, ok := iCmd.(*riak.SearchCommand)
- if !ok {
- return nil, fmt.Errorf("Riak command unexpected type %T", iCmd)
- }
- if cmd.Response == nil || cmd.Response.NumFound == 0 {
- return nil, nil
+ if err != nil {
+ return nil, errors.New("building Riak command: " + err.Error())
+ }
+ if err = cluster.Execute(iCmd); err != nil {
+ return nil, errors.New("executing Riak command index '" + index + "' query '" + query + "': " + err.Error())
+ }
+ cmd, ok := iCmd.(*riak.SearchCommand)
+ if !ok {
+ return nil, fmt.Errorf("riak command unexpected type %T", iCmd)
+ }
+ if cmd.Response == nil {
+ return nil, fmt.Errorf("riak recieved nil responce")
Review comment:
What, you've never seen it spelled "responce"!? :laughing:
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@trafficcontrol.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org