You are viewing a plain text version of this content. The canonical link for it is here.
Posted to issues@lucene.apache.org by GitBox <gi...@apache.org> on 2020/08/02 10:01:52 UTC
[GitHub] [lucene-solr] MarcusSorealheis opened a new pull request #1711: SOLR-14702: Remove oppressive language (part1)
MarcusSorealheis opened a new pull request #1711:
URL: https://github.com/apache/lucene-solr/pull/1711
<!--
_(If you are a project committer then you may remove some/all of the following template.)_
Before creating a pull request, please file an issue in the ASF Jira system for Lucene or Solr:
* https://issues.apache.org/jira/projects/LUCENE
* https://issues.apache.org/jira/projects/SOLR
You will need to create an account in Jira in order to create an issue.
The title of the PR should reference the Jira issue number in the form:
* LUCENE-####: <short description of problem or changes>
* SOLR-####: <short description of problem or changes>
LUCENE and SOLR must be fully capitalized. A short description helps people scanning pull requests for items they can work on.
Properly referencing the issue in the title ensures that Jira is correctly updated with code review comments and commits. -->
# Description
This PR removes all references of "master slave" from the Solr code base. this should've happened years ago as it can result in alienating many people working with the project.
# Solution
Replaces master with leader and slave with follower.
# Tests
Run standard tests.
# Checklist
Please review the following and check all that apply:
- [ ] I have reviewed the guidelines for [How to Contribute](https://wiki.apache.org/solr/HowToContribute) and my code conforms to the standards described there to the best of my ability.
- [ ] I have created a Jira issue and added the issue ID to my pull request title.
- [ ] I have given Solr maintainers [access](https://help.github.com/en/articles/allowing-changes-to-a-pull-request-branch-created-from-a-fork) to contribute to my PR branch. (optional but recommended)
- [ ] I have developed this patch against the `master` branch.
- [ ] I have run `ant precommit` and the appropriate test suite.
- [ ] I have added tests for my changes.
- [ ] I have added documentation for the [Ref Guide](https://github.com/apache/lucene-solr/tree/master/solr/solr-ref-guide) (for Solr changes only).
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: issues-unsubscribe@lucene.apache.org
For additional commands, e-mail: issues-help@lucene.apache.org
[GitHub] [lucene-solr] tflobbe commented on a change in pull request #1711: SOLR-14702: Remove oppressive language (part1)
Posted by GitBox <gi...@apache.org>.
tflobbe commented on a change in pull request #1711:
URL: https://github.com/apache/lucene-solr/pull/1711#discussion_r466006354
##########
File path: solr/core/src/java/org/apache/solr/handler/ReplicationHandler.java
##########
@@ -406,15 +436,15 @@ static Long getCheckSum(Checksum checksum, File f) {
private volatile IndexFetcher currentIndexFetcher;
public IndexFetchResult doFetch(SolrParams solrParams, boolean forceReplication) {
- String masterUrl = solrParams == null ? null : solrParams.get(MASTER_URL);
+ String leaderUrl = solrParams == null ? null : solrParams.get(LEADER_URL);
Review comment:
I wasn't able to push to the PR directly, don't know if I'm doing something wrong or something wasn't correctly configured. I'll push to master directly (won't show up here)
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: issues-unsubscribe@lucene.apache.org
For additional commands, e-mail: issues-help@lucene.apache.org
[GitHub] [lucene-solr] tflobbe merged pull request #1711: SOLR-14702: Remove oppressive language (part1)
Posted by GitBox <gi...@apache.org>.
tflobbe merged pull request #1711:
URL: https://github.com/apache/lucene-solr/pull/1711
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: issues-unsubscribe@lucene.apache.org
For additional commands, e-mail: issues-help@lucene.apache.org
[GitHub] [lucene-solr] tflobbe commented on a change in pull request #1711: SOLR-14702: Remove oppressive language (part1)
Posted by GitBox <gi...@apache.org>.
tflobbe commented on a change in pull request #1711:
URL: https://github.com/apache/lucene-solr/pull/1711#discussion_r466047049
##########
File path: solr/core/src/java/org/apache/solr/handler/ReplicationHandler.java
##########
@@ -406,15 +436,15 @@ static Long getCheckSum(Checksum checksum, File f) {
private volatile IndexFetcher currentIndexFetcher;
public IndexFetchResult doFetch(SolrParams solrParams, boolean forceReplication) {
- String masterUrl = solrParams == null ? null : solrParams.get(MASTER_URL);
+ String leaderUrl = solrParams == null ? null : solrParams.get(LEADER_URL);
Review comment:
(Most likely I did something wrong with my setup, I've never committed to some 3rd party PR before)
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: issues-unsubscribe@lucene.apache.org
For additional commands, e-mail: issues-help@lucene.apache.org
[GitHub] [lucene-solr] MarcusSorealheis commented on pull request #1711: SOLR-14702: Remove oppressive language (part1)
Posted by GitBox <gi...@apache.org>.
MarcusSorealheis commented on pull request #1711:
URL: https://github.com/apache/lucene-solr/pull/1711#issuecomment-668441665
@chatman and @tflobbe this one is clean and ready to go almost ready to go (waiting on tests, and will fix any broken ones before converting from draft).
Backward compatibility can be a subsequent PR. I will do it quickly to get it over with. I have a solution for it from my subsequent PR to this one using `primary/secondary`. Anyone else can feel free to do that one if that want, but I can handle it pretty quickly probably.
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: issues-unsubscribe@lucene.apache.org
For additional commands, e-mail: issues-help@lucene.apache.org
[GitHub] [lucene-solr] unrelational commented on a change in pull request #1711: SOLR-14702: Remove oppressive language (part1)
Posted by GitBox <gi...@apache.org>.
unrelational commented on a change in pull request #1711:
URL: https://github.com/apache/lucene-solr/pull/1711#discussion_r466031051
##########
File path: solr/core/src/java/org/apache/solr/handler/ReplicationHandler.java
##########
@@ -406,15 +436,15 @@ static Long getCheckSum(Checksum checksum, File f) {
private volatile IndexFetcher currentIndexFetcher;
public IndexFetchResult doFetch(SolrParams solrParams, boolean forceReplication) {
- String masterUrl = solrParams == null ? null : solrParams.get(MASTER_URL);
+ String leaderUrl = solrParams == null ? null : solrParams.get(LEADER_URL);
Review comment:
That's weird. All maintainers had edit access. Thanks for making the change and merging the PR. Perhaps, I can open another PR with a test case for this ternary? Would that be valuable since it wasn't caught by the added test.
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: issues-unsubscribe@lucene.apache.org
For additional commands, e-mail: issues-help@lucene.apache.org
[GitHub] [lucene-solr] MarcusSorealheis commented on pull request #1711: SOLR-14702: Remove oppressive language (part1)
Posted by GitBox <gi...@apache.org>.
MarcusSorealheis commented on pull request #1711:
URL: https://github.com/apache/lucene-solr/pull/1711#issuecomment-668455706
Feel free to review it. I may not get to the back compat until saturday but I will get to it.
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: issues-unsubscribe@lucene.apache.org
For additional commands, e-mail: issues-help@lucene.apache.org
[GitHub] [lucene-solr] MarcusSorealheis commented on a change in pull request #1711: SOLR-14702: Remove oppressive language (part1)
Posted by GitBox <gi...@apache.org>.
MarcusSorealheis commented on a change in pull request #1711:
URL: https://github.com/apache/lucene-solr/pull/1711#discussion_r466031953
##########
File path: solr/core/src/java/org/apache/solr/handler/ReplicationHandler.java
##########
@@ -406,15 +436,15 @@ static Long getCheckSum(Checksum checksum, File f) {
private volatile IndexFetcher currentIndexFetcher;
public IndexFetchResult doFetch(SolrParams solrParams, boolean forceReplication) {
- String masterUrl = solrParams == null ? null : solrParams.get(MASTER_URL);
+ String leaderUrl = solrParams == null ? null : solrParams.get(LEADER_URL);
Review comment:
Commented from startup account. 🙃 Do you want me to create a test case for this additional ternary operator?
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: issues-unsubscribe@lucene.apache.org
For additional commands, e-mail: issues-help@lucene.apache.org
[GitHub] [lucene-solr] MarcusSorealheis closed pull request #1711: SOLR-14702: Remove oppressive language (part1)
Posted by GitBox <gi...@apache.org>.
MarcusSorealheis closed pull request #1711:
URL: https://github.com/apache/lucene-solr/pull/1711
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: issues-unsubscribe@lucene.apache.org
For additional commands, e-mail: issues-help@lucene.apache.org
[GitHub] [lucene-solr] MarcusSorealheis commented on pull request #1711: SOLR-14702: Remove oppressive language (part1)
Posted by GitBox <gi...@apache.org>.
MarcusSorealheis commented on pull request #1711:
URL: https://github.com/apache/lucene-solr/pull/1711#issuecomment-669052935
Everyone this is ready to go. Thanks @tflobbe for wrapping this up sooner than I could.
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: issues-unsubscribe@lucene.apache.org
For additional commands, e-mail: issues-help@lucene.apache.org
[GitHub] [lucene-solr] tflobbe commented on pull request #1711: SOLR-14702: Remove oppressive language (part1)
Posted by GitBox <gi...@apache.org>.
tflobbe commented on pull request #1711:
URL: https://github.com/apache/lucene-solr/pull/1711#issuecomment-668726808
Thanks Marcus, I'll try to take a look tonight
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: issues-unsubscribe@lucene.apache.org
For additional commands, e-mail: issues-help@lucene.apache.org
[GitHub] [lucene-solr] tflobbe commented on pull request #1711: SOLR-14702: Remove oppressive language (part1)
Posted by GitBox <gi...@apache.org>.
tflobbe commented on pull request #1711:
URL: https://github.com/apache/lucene-solr/pull/1711#issuecomment-668911650
Added a test for legacy configuration. Also, made it so that sometimes we use legacy params in the requests. Pleas take a look
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: issues-unsubscribe@lucene.apache.org
For additional commands, e-mail: issues-help@lucene.apache.org
[GitHub] [lucene-solr] MarcusSorealheis commented on a change in pull request #1711: SOLR-14702: Remove oppressive language (part1)
Posted by GitBox <gi...@apache.org>.
MarcusSorealheis commented on a change in pull request #1711:
URL: https://github.com/apache/lucene-solr/pull/1711#discussion_r466033859
##########
File path: solr/core/src/java/org/apache/solr/handler/ReplicationHandler.java
##########
@@ -406,15 +436,15 @@ static Long getCheckSum(Checksum checksum, File f) {
private volatile IndexFetcher currentIndexFetcher;
public IndexFetchResult doFetch(SolrParams solrParams, boolean forceReplication) {
- String masterUrl = solrParams == null ? null : solrParams.get(MASTER_URL);
+ String leaderUrl = solrParams == null ? null : solrParams.get(LEADER_URL);
Review comment:
You have maintainer edit rights. Not sure what happened
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: issues-unsubscribe@lucene.apache.org
For additional commands, e-mail: issues-help@lucene.apache.org
[GitHub] [lucene-solr] tflobbe commented on pull request #1711: SOLR-14702: Remove oppressive language (part1)
Posted by GitBox <gi...@apache.org>.
tflobbe commented on pull request #1711:
URL: https://github.com/apache/lucene-solr/pull/1711#issuecomment-668889913
@MarcusSorealheis, please see https://github.com/MarcusSorealheis/lucene-solr/pull/5 (PR against your branch). Some minor changes, including an attempt to read legacy conf values and parameter names
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: issues-unsubscribe@lucene.apache.org
For additional commands, e-mail: issues-help@lucene.apache.org
[GitHub] [lucene-solr] tflobbe commented on a change in pull request #1711: SOLR-14702: Remove oppressive language (part1)
Posted by GitBox <gi...@apache.org>.
tflobbe commented on a change in pull request #1711:
URL: https://github.com/apache/lucene-solr/pull/1711#discussion_r465922385
##########
File path: solr/core/src/java/org/apache/solr/handler/ReplicationHandler.java
##########
@@ -406,15 +436,15 @@ static Long getCheckSum(Checksum checksum, File f) {
private volatile IndexFetcher currentIndexFetcher;
public IndexFetchResult doFetch(SolrParams solrParams, boolean forceReplication) {
- String masterUrl = solrParams == null ? null : solrParams.get(MASTER_URL);
+ String leaderUrl = solrParams == null ? null : solrParams.get(LEADER_URL);
Review comment:
hmmm I think we need to read `masterUrl` here too and we missed it. I'll do the change
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: issues-unsubscribe@lucene.apache.org
For additional commands, e-mail: issues-help@lucene.apache.org
[GitHub] [lucene-solr] MarcusSorealheis commented on pull request #1711: SOLR-14702: Remove oppressive language (part1)
Posted by GitBox <gi...@apache.org>.
MarcusSorealheis commented on pull request #1711:
URL: https://github.com/apache/lucene-solr/pull/1711#issuecomment-668441771
that way we can support rolling upgrades
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: issues-unsubscribe@lucene.apache.org
For additional commands, e-mail: issues-help@lucene.apache.org
[GitHub] [lucene-solr] tflobbe commented on a change in pull request #1711: SOLR-14702: Remove oppressive language (part1)
Posted by GitBox <gi...@apache.org>.
tflobbe commented on a change in pull request #1711:
URL: https://github.com/apache/lucene-solr/pull/1711#discussion_r466037673
##########
File path: solr/core/src/java/org/apache/solr/handler/ReplicationHandler.java
##########
@@ -406,15 +436,15 @@ static Long getCheckSum(Checksum checksum, File f) {
private volatile IndexFetcher currentIndexFetcher;
public IndexFetchResult doFetch(SolrParams solrParams, boolean forceReplication) {
- String masterUrl = solrParams == null ? null : solrParams.get(MASTER_URL);
+ String leaderUrl = solrParams == null ? null : solrParams.get(LEADER_URL);
Review comment:
It should be tested with this change: https://github.com/apache/lucene-solr/pull/1711/commits/8ae5a476021fa5ad122375080d315c0234229a2d#diff-a711e0f6e912250c48a73a96d1d01c57R843, but it's only tested "rarely()", which may gave been why we didn't catch in on our tests.
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: issues-unsubscribe@lucene.apache.org
For additional commands, e-mail: issues-help@lucene.apache.org