[GitHub] [lucene-solr] MarcusSorealheis commented on a change in pull request #1712: SOLR-14702: Remove oppressive language (part1)
MarcusSorealheis commented on a change in pull request #1712:
URL: https://github.com/apache/lucene-solr/pull/1712#discussion_r464863669
##
File path: solr/core/src/java/org/apache/solr/handler/IndexFetcher.java
##
@@ -404,35 +404,35 @@ IndexFetchResult fetchLatestIndex(boolean
forceReplication, boolean forceCoreRel
}
return IndexFetchResult.LEADER_IS_NOT_ACTIVE;
}
-if (!replica.getCoreUrl().equals(masterUrl)) {
- masterUrl = replica.getCoreUrl();
- log.info("Updated masterUrl to {}", masterUrl);
+if (!replica.getCoreUrl().equals(primaryUrl)) {
+ primaryUrl = replica.getCoreUrl();
+ log.info("Updated primaryUrl to {}", primaryUrl);
// TODO: Do we need to set forceReplication = true?
} else {
- log.debug("masterUrl didn't change");
+ log.debug("primaryUrl didn't change");
}
}
- //get the current 'replicateable' index version in the master
+ //get the current 'replicateable' index version in the primary
@SuppressWarnings({"rawtypes"})
NamedList response;
try {
response = getLatestVersion();
} catch (Exception e) {
final String errorMsg = e.toString();
if (!Strings.isNullOrEmpty(errorMsg) &&
errorMsg.contains(INTERRUPT_RESPONSE_MESSAGE)) {
-log.warn("Master at: {} is not available. Index fetch failed by
interrupt. Exception: {}", masterUrl, errorMsg);
+log.warn("Primary at: {} is not available. Index fetch failed by
interrupt. Exception: {}", primaryUrl, errorMsg);
return new
IndexFetchResult(IndexFetchResult.FAILED_BY_INTERRUPT_MESSAGE, false, e);
} else {
-log.warn("Master at: {} is not available. Index fetch failed by
exception: {}", masterUrl, errorMsg);
+log.warn("Primary at: {} is not available. Index fetch failed by
exception: {}", primaryUrl, errorMsg);
return new
IndexFetchResult(IndexFetchResult.FAILED_BY_EXCEPTION_MESSAGE, false, e);
}
}
long latestVersion = (Long) response.get(CMD_INDEX_VERSION);
long latestGeneration = (Long) response.get(GENERATION);
- log.info("Master's generation: {}", latestGeneration);
- log.info("Master's version: {}", latestVersion);
+ log.info("Primary's generation: {}", latestGeneration);
+ log.info("Primary's version: {}", latestVersion);
Review comment:
Shawn suggested that we shouldn't use the same terminology for the
legacy architecture. I've updated the first PR in any event. At this time,
keeping the same terminology seems to be the right way to go unless I rewrite
the replication handler. There's an argument for that because I'm sure there
are areas where we could improve, but it won't happen in this PR.
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:
us...@infra.apache.org
-
To unsubscribe, e-mail: issues-unsubscr...@lucene.apache.org
For additional commands, e-mail: issues-h...@lucene.apache.org
[GitHub] [lucene-solr] MarcusSorealheis commented on a change in pull request #1712: SOLR-14702: Remove oppressive language (part1)
MarcusSorealheis commented on a change in pull request #1712: URL: https://github.com/apache/lucene-solr/pull/1712#discussion_r464842743 ## File path: solr/solr-ref-guide/src/cloud-screens.adoc ## @@ -23,7 +23,7 @@ This screen provides status information about each collection & node in your clu .Only Visible When using SolrCloud [NOTE] -The "Cloud" menu option is only available on Solr instances running in <>. Single node or master/slave replication instances of Solr will not display this option. +The "Cloud" menu option is only available on Solr instances running in <>. Single node or primary/secondary replication instances of Solr will not display this option. Review comment: I don't think I'm on that list. 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: us...@infra.apache.org - To unsubscribe, e-mail: issues-unsubscr...@lucene.apache.org For additional commands, e-mail: issues-h...@lucene.apache.org
[GitHub] [lucene-solr] MarcusSorealheis commented on a change in pull request #1712: SOLR-14702: Remove oppressive language (part1)
MarcusSorealheis commented on a change in pull request #1712: URL: https://github.com/apache/lucene-solr/pull/1712#discussion_r464841858 ## File path: solr/solr-ref-guide/src/cloud-screens.adoc ## @@ -23,7 +23,7 @@ This screen provides status information about each collection & node in your clu .Only Visible When using SolrCloud [NOTE] -The "Cloud" menu option is only available on Solr instances running in <>. Single node or master/slave replication instances of Solr will not display this option. +The "Cloud" menu option is only available on Solr instances running in <>. Single node or primary/secondary replication instances of Solr will not display this option. Review comment: Ok ## File path: solr/solr-ref-guide/src/cloud-screens.adoc ## @@ -23,7 +23,7 @@ This screen provides status information about each collection & node in your clu .Only Visible When using SolrCloud [NOTE] -The "Cloud" menu option is only available on Solr instances running in <>. Single node or master/slave replication instances of Solr will not display this option. +The "Cloud" menu option is only available on Solr instances running in <>. Single node or primary/secondary replication instances of Solr will not display this option. Review comment: I'd never seen that email 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: us...@infra.apache.org - To unsubscribe, e-mail: issues-unsubscr...@lucene.apache.org For additional commands, e-mail: issues-h...@lucene.apache.org
[GitHub] [lucene-solr] MarcusSorealheis commented on a change in pull request #1712: SOLR-14702: Remove oppressive language (part1)
MarcusSorealheis commented on a change in pull request #1712:
URL: https://github.com/apache/lucene-solr/pull/1712#discussion_r464826670
##
File path: solr/core/src/java/org/apache/solr/handler/IndexFetcher.java
##
@@ -404,35 +404,35 @@ IndexFetchResult fetchLatestIndex(boolean
forceReplication, boolean forceCoreRel
}
return IndexFetchResult.LEADER_IS_NOT_ACTIVE;
}
-if (!replica.getCoreUrl().equals(masterUrl)) {
- masterUrl = replica.getCoreUrl();
- log.info("Updated masterUrl to {}", masterUrl);
+if (!replica.getCoreUrl().equals(primaryUrl)) {
+ primaryUrl = replica.getCoreUrl();
+ log.info("Updated primaryUrl to {}", primaryUrl);
// TODO: Do we need to set forceReplication = true?
} else {
- log.debug("masterUrl didn't change");
+ log.debug("primaryUrl didn't change");
}
}
- //get the current 'replicateable' index version in the master
+ //get the current 'replicateable' index version in the primary
@SuppressWarnings({"rawtypes"})
NamedList response;
try {
response = getLatestVersion();
} catch (Exception e) {
final String errorMsg = e.toString();
if (!Strings.isNullOrEmpty(errorMsg) &&
errorMsg.contains(INTERRUPT_RESPONSE_MESSAGE)) {
-log.warn("Master at: {} is not available. Index fetch failed by
interrupt. Exception: {}", masterUrl, errorMsg);
+log.warn("Primary at: {} is not available. Index fetch failed by
interrupt. Exception: {}", primaryUrl, errorMsg);
return new
IndexFetchResult(IndexFetchResult.FAILED_BY_INTERRUPT_MESSAGE, false, e);
} else {
-log.warn("Master at: {} is not available. Index fetch failed by
exception: {}", masterUrl, errorMsg);
+log.warn("Primary at: {} is not available. Index fetch failed by
exception: {}", primaryUrl, errorMsg);
return new
IndexFetchResult(IndexFetchResult.FAILED_BY_EXCEPTION_MESSAGE, false, e);
}
}
long latestVersion = (Long) response.get(CMD_INDEX_VERSION);
long latestGeneration = (Long) response.get(GENERATION);
- log.info("Master's generation: {}", latestGeneration);
- log.info("Master's version: {}", latestVersion);
+ log.info("Primary's generation: {}", latestGeneration);
+ log.info("Primary's version: {}", latestVersion);
Review comment:
gothca
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:
us...@infra.apache.org
-
To unsubscribe, e-mail: issues-unsubscr...@lucene.apache.org
For additional commands, e-mail: issues-h...@lucene.apache.org
[GitHub] [lucene-solr] MarcusSorealheis commented on a change in pull request #1712: SOLR-14702: Remove oppressive language (part1)
MarcusSorealheis commented on a change in pull request #1712:
URL: https://github.com/apache/lucene-solr/pull/1712#discussion_r464826399
##
File path: solr/core/src/java/org/apache/solr/handler/IndexFetcher.java
##
@@ -236,27 +236,27 @@ public IndexFetcher(@SuppressWarnings({"rawtypes"})final
NamedList initArgs, fin
if (fetchFromLeader != null && fetchFromLeader instanceof Boolean) {
this.fetchFromLeader = (boolean) fetchFromLeader;
}
-Object skipCommitOnMasterVersionZero =
initArgs.get(SKIP_COMMIT_ON_MASTER_VERSION_ZERO);
-if (skipCommitOnMasterVersionZero != null && skipCommitOnMasterVersionZero
instanceof Boolean) {
- this.skipCommitOnMasterVersionZero = (boolean)
skipCommitOnMasterVersionZero;
+Object skipCommitOnPrimaryVersionZero =
initArgs.get(SKIP_COMMIT_ON_MASTER_VERSION_ZERO);
Review comment:
It doesn't have to handle back-compat in this PR. I can commit to it
prior to 9.0's release and even prioritize the work before opening PRs on the
other work I am doing.
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:
us...@infra.apache.org
-
To unsubscribe, e-mail: issues-unsubscr...@lucene.apache.org
For additional commands, e-mail: issues-h...@lucene.apache.org
[GitHub] [lucene-solr] MarcusSorealheis commented on a change in pull request #1712: SOLR-14702: Remove oppressive language (part1)
MarcusSorealheis commented on a change in pull request #1712:
URL: https://github.com/apache/lucene-solr/pull/1712#discussion_r464826083
##
File path: solr/core/src/java/org/apache/solr/handler/IndexFetcher.java
##
@@ -236,27 +236,27 @@ public IndexFetcher(@SuppressWarnings({"rawtypes"})final
NamedList initArgs, fin
if (fetchFromLeader != null && fetchFromLeader instanceof Boolean) {
this.fetchFromLeader = (boolean) fetchFromLeader;
}
-Object skipCommitOnMasterVersionZero =
initArgs.get(SKIP_COMMIT_ON_MASTER_VERSION_ZERO);
-if (skipCommitOnMasterVersionZero != null && skipCommitOnMasterVersionZero
instanceof Boolean) {
- this.skipCommitOnMasterVersionZero = (boolean)
skipCommitOnMasterVersionZero;
+Object skipCommitOnPrimaryVersionZero =
initArgs.get(SKIP_COMMIT_ON_MASTER_VERSION_ZERO);
Review comment:
I think this is the only one that needs to change, possibly. Still
stitching it all together.
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:
us...@infra.apache.org
-
To unsubscribe, e-mail: issues-unsubscr...@lucene.apache.org
For additional commands, e-mail: issues-h...@lucene.apache.org
[GitHub] [lucene-solr] MarcusSorealheis commented on a change in pull request #1712: SOLR-14702: Remove oppressive language (part1)
MarcusSorealheis commented on a change in pull request #1712:
URL: https://github.com/apache/lucene-solr/pull/1712#discussion_r464823586
##
File path: solr/core/src/java/org/apache/solr/handler/CdcrRequestHandler.java
##
@@ -733,12 +733,12 @@ private void handleBootstrapStatus(SolrQueryRequest req,
SolrQueryResponse rsp)
}
static class BootstrapCallable implements Callable, Closeable {
-private final String masterUrl;
+private final String primaryUrl;
Review comment:
this whole file should go away, but that's a PR for another night...but
in progress!
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:
us...@infra.apache.org
-
To unsubscribe, e-mail: issues-unsubscr...@lucene.apache.org
For additional commands, e-mail: issues-h...@lucene.apache.org
[GitHub] [lucene-solr] MarcusSorealheis commented on a change in pull request #1712: SOLR-14702: Remove oppressive language (part1)
MarcusSorealheis commented on a change in pull request #1712: URL: https://github.com/apache/lucene-solr/pull/1712#discussion_r464823056 ## File path: solr/core/src/java/org/apache/solr/cloud/RecoveryStrategy.java ## @@ -239,7 +239,7 @@ final private void replicate(String nodeName, SolrCore core, ZkNodeProps leaderp } ModifiableSolrParams solrParams = new ModifiableSolrParams(); -solrParams.set(ReplicationHandler.MASTER_URL, leaderUrl); +solrParams.set(ReplicationHandler.PRIMARY_URL, leaderUrl); solrParams.set(ReplicationHandler.SKIP_COMMIT_ON_MASTER_VERSION_ZERO, replicaType == Replica.Type.TLOG); Review comment: On second thought, this is a reference to the replication handler. One of the few links between the old way and the new one. 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: us...@infra.apache.org - To unsubscribe, e-mail: issues-unsubscr...@lucene.apache.org For additional commands, e-mail: issues-h...@lucene.apache.org
[GitHub] [lucene-solr] MarcusSorealheis commented on a change in pull request #1712: SOLR-14702: Remove oppressive language (part1)
MarcusSorealheis commented on a change in pull request #1712: URL: https://github.com/apache/lucene-solr/pull/1712#discussion_r464823056 ## File path: solr/core/src/java/org/apache/solr/cloud/RecoveryStrategy.java ## @@ -239,7 +239,7 @@ final private void replicate(String nodeName, SolrCore core, ZkNodeProps leaderp } ModifiableSolrParams solrParams = new ModifiableSolrParams(); -solrParams.set(ReplicationHandler.MASTER_URL, leaderUrl); +solrParams.set(ReplicationHandler.PRIMARY_URL, leaderUrl); solrParams.set(ReplicationHandler.SKIP_COMMIT_ON_MASTER_VERSION_ZERO, replicaType == Replica.Type.TLOG); Review comment: On second thought, this is a reference to the replication handler. One of the view links between the old way and the new one. 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: us...@infra.apache.org - To unsubscribe, e-mail: issues-unsubscr...@lucene.apache.org For additional commands, e-mail: issues-h...@lucene.apache.org
[GitHub] [lucene-solr] MarcusSorealheis commented on a change in pull request #1712: SOLR-14702: Remove oppressive language (part1)
MarcusSorealheis commented on a change in pull request #1712: URL: https://github.com/apache/lucene-solr/pull/1712#discussion_r464818639 ## File path: solr/solr-ref-guide/src/cloud-screens.adoc ## @@ -23,7 +23,7 @@ This screen provides status information about each collection & node in your clu .Only Visible When using SolrCloud [NOTE] -The "Cloud" menu option is only available on Solr instances running in <>. Single node or master/slave replication instances of Solr will not display this option. +The "Cloud" menu option is only available on Solr instances running in <>. Single node or primary/secondary replication instances of Solr will not display this option. Review comment: You are the only one truly **adamant** about changing to leader follower that I have seen thus far, so I'm not sure we will go that route. Unless, of course, you are willing to make the changes in that branch. You have a had start. :) 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: us...@infra.apache.org - To unsubscribe, e-mail: issues-unsubscr...@lucene.apache.org For additional commands, e-mail: issues-h...@lucene.apache.org
[GitHub] [lucene-solr] MarcusSorealheis commented on a change in pull request #1712: SOLR-14702: Remove oppressive language (part1)
MarcusSorealheis commented on a change in pull request #1712: URL: https://github.com/apache/lucene-solr/pull/1712#discussion_r464817908 ## File path: solr/solr-ref-guide/src/replication-screen.adoc ## @@ -16,10 +16,10 @@ // specific language governing permissions and limitations // under the License. -The Replication screen shows you the current replication state for the core you have specified. <> has supplanted much of this functionality, but if you are still using Master-Slave index replication, you can use this screen to: +The Replication screen shows you the current replication state for the core you have specified. <> has supplanted much of this functionality, but if you are still using Primary-Secondary index replication, you can use this screen to: . View the replicatable index state. (on a master node) Review comment: Missed what 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: us...@infra.apache.org - To unsubscribe, e-mail: issues-unsubscr...@lucene.apache.org For additional commands, e-mail: issues-h...@lucene.apache.org
[GitHub] [lucene-solr] MarcusSorealheis commented on a change in pull request #1712: SOLR-14702: Remove oppressive language (part1)
MarcusSorealheis commented on a change in pull request #1712: URL: https://github.com/apache/lucene-solr/pull/1712#discussion_r464817727 ## File path: solr/core/src/java/org/apache/solr/cloud/RecoveryStrategy.java ## @@ -239,7 +239,7 @@ final private void replicate(String nodeName, SolrCore core, ZkNodeProps leaderp } ModifiableSolrParams solrParams = new ModifiableSolrParams(); -solrParams.set(ReplicationHandler.MASTER_URL, leaderUrl); +solrParams.set(ReplicationHandler.PRIMARY_URL, leaderUrl); solrParams.set(ReplicationHandler.SKIP_COMMIT_ON_MASTER_VERSION_ZERO, replicaType == Replica.Type.TLOG); Review comment: oof. good catch 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: us...@infra.apache.org - To unsubscribe, e-mail: issues-unsubscr...@lucene.apache.org For additional commands, e-mail: issues-h...@lucene.apache.org
[GitHub] [lucene-solr] MarcusSorealheis commented on a change in pull request #1712: SOLR-14702: Remove oppressive language (part1)
MarcusSorealheis commented on a change in pull request #1712:
URL: https://github.com/apache/lucene-solr/pull/1712#discussion_r464817633
##
File path: solr/core/src/java/org/apache/solr/cloud/ReplicateFromLeader.java
##
@@ -76,12 +76,12 @@ public void startReplication(boolean switchTransactionLog)
throws InterruptedExc
}
log.info("Will start replication from leader with poll interval: {}",
pollIntervalStr );
- NamedList slaveConfig = new NamedList<>();
- slaveConfig.add("fetchFromLeader", Boolean.TRUE);
- slaveConfig.add(ReplicationHandler.SKIP_COMMIT_ON_MASTER_VERSION_ZERO,
switchTransactionLog);
- slaveConfig.add("pollInterval", pollIntervalStr);
+ NamedList secondaryConfig = new NamedList<>();
+ secondaryConfig.add("fetchFromLeader", Boolean.TRUE);
+
secondaryConfig.add(ReplicationHandler.SKIP_COMMIT_ON_MASTER_VERSION_ZERO,
switchTransactionLog);
+ secondaryConfig.add("pollInterval", pollIntervalStr);
NamedList replicationConfig = new NamedList<>();
- replicationConfig.add("slave", slaveConfig);
+ replicationConfig.add("secondary", secondaryConfig);
Review comment:
thanks
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:
us...@infra.apache.org
-
To unsubscribe, e-mail: issues-unsubscr...@lucene.apache.org
For additional commands, e-mail: issues-h...@lucene.apache.org
[GitHub] [lucene-solr] MarcusSorealheis commented on a change in pull request #1712: SOLR-14702: Remove oppressive language (part1)
MarcusSorealheis commented on a change in pull request #1712:
URL: https://github.com/apache/lucene-solr/pull/1712#discussion_r464732631
##
File path: solr/core/src/java/org/apache/solr/handler/ReplicationHandler.java
##
@@ -1241,33 +1241,33 @@ public void inform(SolrCore core) {
numberBackupsToKeep = 0;
}
@SuppressWarnings({"rawtypes"})
-NamedList slave = (NamedList) initArgs.get("slave");
-boolean enableSlave = isEnabled( slave );
-if (enableSlave) {
- currentIndexFetcher = pollingIndexFetcher = new IndexFetcher(slave,
this, core);
- setupPolling((String) slave.get(POLL_INTERVAL));
- isSlave = true;
+NamedList secondary = (NamedList) initArgs.get("secondary");
+boolean enableSecondary = isEnabled( secondary );
+if (enableSecondary) {
+ currentIndexFetcher = pollingIndexFetcher = new IndexFetcher(secondary,
this, core);
+ setupPolling((String) secondary.get(POLL_INTERVAL));
+ isSecondary = true;
}
@SuppressWarnings({"rawtypes"})
-NamedList master = (NamedList) initArgs.get("master");
-boolean enableMaster = isEnabled( master );
+NamedList primary = (NamedList) initArgs.get("primary");
Review comment:
> > except for the backcompat issue (which I don't think matters at all).
>
> What's the real issue? Let's accept as input "master" or "primary" in one
case and "slave" or "secondary" in the other, as well as send both values over
the wire as output.
> This will make new code and old code compatible (old talking to new and
new talking to old). Once only new code is running, we can safely remove
sending or accepting the offending terms.
The real issue here is that the terms should've been removed years ago, or
never used. They are super stressful to interact with and every time I combed
through my changes here it was really frustrating. I was in college when the
project was released. These terms were not used at Grinnell College. I could
give a history lesson if you'd like to understand, but I think we should align
with the standards put forth by the IETF and expressed in the Apache Code of
Conduct at a minimum. We should also remember to prioritize community over
code. We shouldn't even be looking to preserve rolling upgrades in favor of
keeping such stressful nomenclature. There's so much changing in 9 already that
is backward incompatible.
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:
us...@infra.apache.org
-
To unsubscribe, e-mail: issues-unsubscr...@lucene.apache.org
For additional commands, e-mail: issues-h...@lucene.apache.org
[GitHub] [lucene-solr] MarcusSorealheis commented on a change in pull request #1712: SOLR-14702: Remove oppressive language (part1)
MarcusSorealheis commented on a change in pull request #1712:
URL: https://github.com/apache/lucene-solr/pull/1712#discussion_r46469
##
File path: solr/core/src/java/org/apache/solr/handler/ReplicationHandler.java
##
@@ -1241,33 +1241,33 @@ public void inform(SolrCore core) {
numberBackupsToKeep = 0;
}
@SuppressWarnings({"rawtypes"})
-NamedList slave = (NamedList) initArgs.get("slave");
-boolean enableSlave = isEnabled( slave );
-if (enableSlave) {
- currentIndexFetcher = pollingIndexFetcher = new IndexFetcher(slave,
this, core);
- setupPolling((String) slave.get(POLL_INTERVAL));
- isSlave = true;
+NamedList secondary = (NamedList) initArgs.get("secondary");
+boolean enableSecondary = isEnabled( secondary );
+if (enableSecondary) {
+ currentIndexFetcher = pollingIndexFetcher = new IndexFetcher(secondary,
this, core);
+ setupPolling((String) secondary.get(POLL_INTERVAL));
+ isSecondary = true;
}
@SuppressWarnings({"rawtypes"})
-NamedList master = (NamedList) initArgs.get("master");
-boolean enableMaster = isEnabled( master );
+NamedList primary = (NamedList) initArgs.get("primary");
Review comment:
That's what I added I thought @tflobbe Can you let me know where there
other places where I should anticipate receiving `slave` or `master`
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:
us...@infra.apache.org
-
To unsubscribe, e-mail: issues-unsubscr...@lucene.apache.org
For additional commands, e-mail: issues-h...@lucene.apache.org
[GitHub] [lucene-solr] MarcusSorealheis commented on a change in pull request #1712: SOLR-14702: Remove oppressive language (part1)
MarcusSorealheis commented on a change in pull request #1712:
URL: https://github.com/apache/lucene-solr/pull/1712#discussion_r464142802
##
File path: solr/core/src/java/org/apache/solr/handler/ReplicationHandler.java
##
@@ -1241,33 +1241,33 @@ public void inform(SolrCore core) {
numberBackupsToKeep = 0;
}
@SuppressWarnings({"rawtypes"})
-NamedList slave = (NamedList) initArgs.get("slave");
-boolean enableSlave = isEnabled( slave );
-if (enableSlave) {
- currentIndexFetcher = pollingIndexFetcher = new IndexFetcher(slave,
this, core);
- setupPolling((String) slave.get(POLL_INTERVAL));
- isSlave = true;
+NamedList secondary = (NamedList) initArgs.get("secondary");
+boolean enableSecondary = isEnabled( secondary );
+if (enableSecondary) {
+ currentIndexFetcher = pollingIndexFetcher = new IndexFetcher(secondary,
this, core);
+ setupPolling((String) secondary.get(POLL_INTERVAL));
+ isSecondary = true;
}
@SuppressWarnings({"rawtypes"})
-NamedList master = (NamedList) initArgs.get("master");
-boolean enableMaster = isEnabled( master );
+NamedList primary = (NamedList) initArgs.get("primary");
Review comment:
I changed it to this: `NamedList primary =
(NamedList)(initArgs.get("primary") != null ? initArgs.get("primary") :
initArgs.get("master"));`
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:
us...@infra.apache.org
-
To unsubscribe, e-mail: issues-unsubscr...@lucene.apache.org
For additional commands, e-mail: issues-h...@lucene.apache.org
[GitHub] [lucene-solr] MarcusSorealheis commented on a change in pull request #1712: SOLR-14702: Remove oppressive language (part1)
MarcusSorealheis commented on a change in pull request #1712:
URL: https://github.com/apache/lucene-solr/pull/1712#discussion_r464140926
##
File path: solr/core/src/java/org/apache/solr/handler/ReplicationHandler.java
##
@@ -1241,33 +1241,33 @@ public void inform(SolrCore core) {
numberBackupsToKeep = 0;
}
@SuppressWarnings({"rawtypes"})
-NamedList slave = (NamedList) initArgs.get("slave");
-boolean enableSlave = isEnabled( slave );
-if (enableSlave) {
- currentIndexFetcher = pollingIndexFetcher = new IndexFetcher(slave,
this, core);
- setupPolling((String) slave.get(POLL_INTERVAL));
- isSlave = true;
+NamedList secondary = (NamedList) initArgs.get("secondary");
+boolean enableSecondary = isEnabled( secondary );
+if (enableSecondary) {
+ currentIndexFetcher = pollingIndexFetcher = new IndexFetcher(secondary,
this, core);
+ setupPolling((String) secondary.get(POLL_INTERVAL));
+ isSecondary = true;
}
@SuppressWarnings({"rawtypes"})
-NamedList master = (NamedList) initArgs.get("master");
-boolean enableMaster = isEnabled( master );
+NamedList primary = (NamedList) initArgs.get("primary");
Review comment:
`initArgs.containsKey("primary") ? initArgs.get("primary") :
initArgs.get("master")`?
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:
us...@infra.apache.org
-
To unsubscribe, e-mail: issues-unsubscr...@lucene.apache.org
For additional commands, e-mail: issues-h...@lucene.apache.org
[GitHub] [lucene-solr] MarcusSorealheis commented on a change in pull request #1712: SOLR-14702: Remove oppressive language (part1)
MarcusSorealheis commented on a change in pull request #1712: URL: https://github.com/apache/lucene-solr/pull/1712#discussion_r464139788 ## File path: solr/solr-ref-guide/src/query-settings-in-solrconfig.adoc ## @@ -203,7 +203,7 @@ This setting controls whether search requests for which there is not a currently === maxWarmingSearchers -This parameter sets the maximum number of searchers that may be warming up in the background at any given time. Exceeding this limit will raise an error. For read-only slaves, a value of two is reasonable. Masters should probably be set a little higher. +This parameter sets the maximum number of searchers that may be warming up in the background at any given time. Exceeding this limit will raise an error. For read-only secondaries, a value of two is reasonable. Primarys should probably be set a little higher. Review comment: I've made this change @chatman 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: us...@infra.apache.org - To unsubscribe, e-mail: issues-unsubscr...@lucene.apache.org For additional commands, e-mail: issues-h...@lucene.apache.org
[GitHub] [lucene-solr] MarcusSorealheis commented on a change in pull request #1712: SOLR-14702: Remove oppressive language (part1)
MarcusSorealheis commented on a change in pull request #1712:
URL: https://github.com/apache/lucene-solr/pull/1712#discussion_r464138343
##
File path: solr/core/src/java/org/apache/solr/handler/ReplicationHandler.java
##
@@ -1241,33 +1241,33 @@ public void inform(SolrCore core) {
numberBackupsToKeep = 0;
}
@SuppressWarnings({"rawtypes"})
-NamedList slave = (NamedList) initArgs.get("slave");
-boolean enableSlave = isEnabled( slave );
-if (enableSlave) {
- currentIndexFetcher = pollingIndexFetcher = new IndexFetcher(slave,
this, core);
- setupPolling((String) slave.get(POLL_INTERVAL));
- isSlave = true;
+NamedList secondary = (NamedList) initArgs.get("secondary");
+boolean enableSecondary = isEnabled( secondary );
+if (enableSecondary) {
+ currentIndexFetcher = pollingIndexFetcher = new IndexFetcher(secondary,
this, core);
+ setupPolling((String) secondary.get(POLL_INTERVAL));
+ isSecondary = true;
}
@SuppressWarnings({"rawtypes"})
-NamedList master = (NamedList) initArgs.get("master");
-boolean enableMaster = isEnabled( master );
+NamedList primary = (NamedList) initArgs.get("primary");
Review comment:
I'm going to look through it. Hopefully I can grok it. Not sure, though.
If I can find a more backcompat approach, I will drop it in the PR. Open to
suggestions from others.
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:
us...@infra.apache.org
-
To unsubscribe, e-mail: issues-unsubscr...@lucene.apache.org
For additional commands, e-mail: issues-h...@lucene.apache.org
[GitHub] [lucene-solr] MarcusSorealheis commented on a change in pull request #1712: SOLR-14702: Remove oppressive language (part1)
MarcusSorealheis commented on a change in pull request #1712: URL: https://github.com/apache/lucene-solr/pull/1712#discussion_r464134375 ## File path: solr/solr-ref-guide/src/query-settings-in-solrconfig.adoc ## @@ -203,7 +203,7 @@ This setting controls whether search requests for which there is not a currently === maxWarmingSearchers -This parameter sets the maximum number of searchers that may be warming up in the background at any given time. Exceeding this limit will raise an error. For read-only slaves, a value of two is reasonable. Masters should probably be set a little higher. +This parameter sets the maximum number of searchers that may be warming up in the background at any given time. Exceeding this limit will raise an error. For read-only secondaries, a value of two is reasonable. Primarys should probably be set a little higher. Review comment: ok that's a good suggestion. Primarys was another typo. I'll add 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: us...@infra.apache.org - To unsubscribe, e-mail: issues-unsubscr...@lucene.apache.org For additional commands, e-mail: issues-h...@lucene.apache.org
[GitHub] [lucene-solr] MarcusSorealheis commented on a change in pull request #1712: SOLR-14702: Remove oppressive language (part1)
MarcusSorealheis commented on a change in pull request #1712: URL: https://github.com/apache/lucene-solr/pull/1712#discussion_r464128075 ## File path: solr/core/src/java/org/apache/solr/security/JWTVerificationkeyResolver.java ## @@ -106,7 +106,7 @@ public Key resolveKey(JsonWebSignature jws, List nestingContex } } - // Add all keys into a master list + // Add all keys into a primary list Review comment: yea, that was a screw up of mine. I would say this can stay master as I have no inherent problem with the word `master` outside of the context of `master/slave`. However, I agree that probably best to remove this one in this case because others do. I'll change it to reference. 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: us...@infra.apache.org - To unsubscribe, e-mail: issues-unsubscr...@lucene.apache.org For additional commands, e-mail: issues-h...@lucene.apache.org
[GitHub] [lucene-solr] MarcusSorealheis commented on a change in pull request #1712: SOLR-14702: Remove oppressive language (part1)
MarcusSorealheis commented on a change in pull request #1712: URL: https://github.com/apache/lucene-solr/pull/1712#discussion_r464098026 ## File path: solr/core/src/java/org/apache/solr/util/hll/HLL.java ## @@ -47,7 +47,7 @@ * https://github.com/aggregateknowledge/postgresql-hll;>postgresql-hll, and * https://github.com/aggregateknowledge/js-hll;>js-hll * - * when https://github.com/aggregateknowledge/postgresql-hll/blob/master/STORAGE.markdown;>properly serialized. + * when https://github.com/aggregateknowledge/postgresql-hll/blob/secondaryy/STORAGE.markdown;>properly serialized. Review comment: is a typo. good catch sorry. 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: us...@infra.apache.org - To unsubscribe, e-mail: issues-unsubscr...@lucene.apache.org For additional commands, e-mail: issues-h...@lucene.apache.org
