[GitHub] [lucene-solr] tflobbe commented on a change in pull request #1712: SOLR-14702: Remove oppressive language (part1)
tflobbe commented on a change in pull request #1712: URL: https://github.com/apache/lucene-solr/pull/1712#discussion_r464820825 ## 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'm not?](http://mail-archives.apache.org/mod_mbox/lucene-solr-user/202006.mbox/%3ccakiern77q+ldckmjhkcvitsley6ptikvnserhv-xa1rysiq...@mail.gmail.com%3e). We can do a sweeping change after we are done with this PR and before merging. Shouldn't be too bad. Also, my comment is about the "mode", which has some other arguments also in that thread. 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] tflobbe commented on a change in pull request #1712: SOLR-14702: Remove oppressive language (part1)
tflobbe commented on a change in pull request #1712: URL: https://github.com/apache/lucene-solr/pull/1712#discussion_r464818931 ## 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: "View the replicatable index state. (on a master node)" 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] tflobbe commented on a change in pull request #1712: SOLR-14702: Remove oppressive language (part1)
tflobbe commented on a change in pull request #1712:
URL: https://github.com/apache/lucene-solr/pull/1712#discussion_r464791347
##
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:
missing master
##
File path: solr/core/src/java/org/apache/solr/handler/ReplicationHandler.java
##
@@ -897,14 +897,14 @@ public void initializeMetrics(SolrMetricsContext
parentContext, String scope) {
true, GENERATION, getCategory().toString(), scope);
solrMetricsContext.gauge(() -> (core != null && !core.isClosed() ?
core.getIndexDir() : ""),
true, "indexPath", getCategory().toString(), scope);
-solrMetricsContext.gauge(() -> isMaster,
- true, "isMaster", getCategory().toString(), scope);
-solrMetricsContext.gauge(() -> isSlave,
- true, "isSlave", getCategory().toString(), scope);
+solrMetricsContext.gauge(() -> isPrimary,
+ true, "isPrimary", getCategory().toString(), scope);
+solrMetricsContext.gauge(() -> isSecondary,
+ true, "isSecondary", getCategory().toString(), scope);
final MetricsMap fetcherMap = new MetricsMap((detailed, map) -> {
IndexFetcher fetcher = currentIndexFetcher;
if (fetcher != null) {
-map.put(MASTER_URL, fetcher.getMasterUrl());
+map.put(PRIMARY_URL, fetcher.getPrimaryUrl());
if (getPollInterval() != null) {
map.put(POLL_INTERVAL, getPollInterval());
}
Review comment:
This part would break compatibility. Maybe we should have a way to
report both metrics? A system property maybe?
##
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 is in the context of SolrCloud, should be "leader"
##
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:
Note that this is in the context of SolrCloud, so "secondary" doesn't
apply and should be instead follower
##
File path: solr/core/src/java/org/apache/solr/handler/ReplicationHandler.java
##
@@ -930,88 +930,88 @@ public void initializeMetrics(SolrMetricsContext
parentContext, String scope) {
}
});
solrMetricsContext.gauge(fetcherMap, true, "fetcher",
getCategory().toString(), scope);
-solrMetricsContext.gauge(() -> isMaster && includeConfFiles != null ?
includeConfFiles : "",
+solrMetricsContext.gauge(() -> isPrimary && includeConfFiles != null ?
includeConfFiles : "",
true, "confFilesToReplicate", getCategory().toString(), scope);
-solrMetricsContext.gauge(() -> isMaster ? getReplicateAfterStrings() :
Collections.emptyList(),
+solrMetricsContext.gauge(() -> isPrimary ? getReplicateAfterStrings() :
Collections.emptyList(),
true, REPLICATE_AFTER, getCategory().toString(), scope);
-solrMetricsContext.gauge( () -> isMaster && replicationEnabled.get(),
+solrMetricsContext.gauge( () -> isPrimary && replicationEnabled.get(),
true, "replicationEnabled", getCategory().toString(), scope);
}
//TODO Should a failure retrieving any piece of info mark the overall
request as a failure? Is there a core set of values that are required to make
a response here useful?
/**
* Used for showing statistics and progress information.
*/
- private
[GitHub] [lucene-solr] tflobbe commented on a change in pull request #1712: SOLR-14702: Remove oppressive language (part1)
tflobbe commented on a change in pull request #1712:
URL: https://github.com/apache/lucene-solr/pull/1712#discussion_r464603609
##
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 don't think this discussion is resolved?
> 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.
+1, this should allow us to be backward compatible (and I'd even suggest we
keep that for the life of 9 to make upgrades easy)
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
