SOLR-15094: Replace all code references of coreNodeName to replicaName #2234
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
![sonatype-lift[bot]](https://avatars.githubusercontent.com/in/9843?s=60&v=4){kind=small}
| String msgNodeName = getNodeName(); | ||
| String msgCore = descriptor.getName(); | ||
|
|
||
| if (msgNodeName.equals(nodeName) && core.equals(msgCore)) { |
There was a problem hiding this comment.
NULLPTR_DEREFERENCE: accessing memory that is the null pointer on line 1710 indirectly during the call to ZkNodeProps.getStr(...).
merging with master
megancarey
reviewed
Jan 29, 2021
| this.collectionName = props.getProperty(CoreDescriptor.CORE_COLLECTION, coreName); | ||
| this.roles = props.getProperty(CoreDescriptor.CORE_ROLES, null); | ||
| this.nodeName = props.getProperty(CoreDescriptor.CORE_NODE_NAME); | ||
| this.nodeName = props.getProperty(REPLICA_NAME); |
Contributor
There was a problem hiding this comment.
Can we rename nodeName internally here as well? I think it's a little misleading
|
|
||
| /** | ||
| * See if coreNodeName has been taken over by another baseUrl and unload core | ||
| * See if replicaName has been taken over by another baseUrl and unload core |
Contributor
There was a problem hiding this comment.
Update the log on line 80, and the variable name "cnn" as well
| private SolrZkClient zkClient; | ||
|
|
||
| public ElectionContext(final String coreNodeName, | ||
| public ElectionContext(final String relicaName, |
| zkStateReader = zkController.getZkStateReader(); | ||
| baseUrl = zkController.getBaseUrl(); | ||
| coreZkNodeName = cd.getCloudDescriptor().getCoreNodeName(); | ||
| replicaName = cd.getCloudDescriptor().getCoreNodeName(); |
Contributor
There was a problem hiding this comment.
Update so we're not using deprecated method
| prepCmd.setCoreName(leaderCoreName); | ||
| prepCmd.setNodeName(zkController.getNodeName()); | ||
| prepCmd.setCoreNodeName(coreZkNodeName); | ||
| prepCmd.setCoreNodeName(replicaName); |
| public void newSearcher(SolrIndexSearcher newSearcher, SolrIndexSearcher currentSearcher) { | ||
| if (sleepTime.get() > 0) { | ||
| TestCloudSearcherWarming.coreNodeNameRef.set(newSearcher.getCore().getCoreDescriptor().getCloudDescriptor().getCoreNodeName()); | ||
| TestCloudSearcherWarming.replicaNameRef.set(newSearcher.getCore().getCoreDescriptor().getCloudDescriptor().getCoreNodeName()); |
| CoreDescriptor.CORE_SHARD, r.getShard(), | ||
| CoreDescriptor.CORE_COLLECTION, r.getCollection(), | ||
| CoreDescriptor.CORE_NODE_NAME, r.getNodeName() | ||
| CommonParams.REPLICA_NAME, r.getNodeName() |
Contributor
There was a problem hiding this comment.
r.getNodeName() should return the name of the node that the replica resides on. Use r.getName()
| } | ||
|
|
||
|
|
||
| @Deprecated |
Contributor
There was a problem hiding this comment.
Super nit: keep getters/setters together :)
| cluster.waitForActiveCollection(COL, 1, 1); | ||
|
|
||
| // determine the coreNodeName of only current replica | ||
| // determine the replicaName of only current replica |
Contributor
There was a problem hiding this comment.
Nit: rename variable on 895
| cluster.waitForActiveCollection(COL, 1, 1); | ||
|
|
||
| // determine the coreNodeName of only current replica | ||
| // determine the replicaName of only current replica |
Contributor
There was a problem hiding this comment.
Nit: Rename variable on 888
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR is just focusing on code level changes.
The actual external facing variables can be addressed separately