Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

SOLR-14371 Zk StatusHandler should know about dynamic zk config #1392

Merged
merged 18 commits into from
Apr 17, 2020
Merged

SOLR-14371 Zk StatusHandler should know about dynamic zk config #1392

Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
987cbe3
SOLR-14371: Zk StatusHandler should know about dynamic zk config
janhoy Mar 30, 2020
66270fa
Able to parse zkstatus both from connection string and config
janhoy Mar 31, 2020
9b625db
Make variables final, use constructor, use Integer over int
janhoy Apr 1, 2020
46a26c9
Adding more config options to the list of valid
janhoy Apr 1, 2020
9b5542a
Remove nocommit. Count observer status as follower
janhoy Apr 1, 2020
9938a1b
Revert adding a bunch of config keys that are not available through 4lw
janhoy Apr 1, 2020
9777985
Move role to ensemble section
janhoy Apr 1, 2020
e765ac2
More review fixes
janhoy Apr 1, 2020
a2cd1ee
Fix tests, handle null input to parseLines method, add javadoc
janhoy Apr 1, 2020
c7288b3
Return 400 error instead of 500 error if parsing of zk config line fails
janhoy Apr 1, 2020
c6aa692
Add error handling if connection string host list is different from d…
janhoy Apr 2, 2020
57f61a3
Update tests with new error msg
janhoy Apr 2, 2020
b989f23
Merge branch 'master' into solr14371-zk-status
janhoy Apr 5, 2020
3975ae2
Merge branch 'master' into solr14371-zk-status
janhoy Apr 7, 2020
7946a6f
Re-phrase docs, do not state that Solr supports reconfiguration.
janhoy Apr 7, 2020
d024c96
Align try block better
janhoy Apr 7, 2020
060978a
Factor out ZkConfigDyn into its own class 'ZkDynamicConfig', move out…
janhoy Apr 7, 2020
b9121f2
Merge branch 'master' into solr14371-zk-status
janhoy Apr 17, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
More review fixes
  • Loading branch information
@janhoy
janhoy committed Apr 1, 2020
commit e765ac26e04994bc73a74a46222aaeac41fecf19
4 changes: 2 additions & 2 deletions solr/core/src/java/org/apache/solr/handler/admin/ZookeeperStatusHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@ public void handleRequestBody(SolrQueryRequest req, SolrQueryResponse rsp) throw
*/
protected Map<String, Object> getZkStatus(String zkHost, List<SolrZkClient.ZkConfigDyn> zkDynamicConfig) {
final List<SolrZkClient.ZkConfigDyn> zookeepers;
boolean dynamicReconfig = false;
if (CollectionUtils.isEmpty(zkDynamicConfig)) {
// Fallback to parsing zkHost for older zk servers without support for dynamic reconfiguration
zookeepers = Arrays.stream(zkHost.split("/")[0].split(","))
Expand All @@ -106,6 +107,7 @@ protected Map<String, Object> getZkStatus(String zkHost, List<SolrZkClient.ZkCon
h.contains(":") ? Integer.parseInt(h.split(":")[1]) : 2181)
).collect(Collectors.toList());
} else {
dynamicReconfig = true;
zookeepers = new ArrayList<>(zkDynamicConfig); // Clone input
}
final Map<String, Object> zkStatus = new HashMap<>();
Expand All @@ -116,7 +118,6 @@ protected Map<String, Object> getZkStatus(String zkHost, List<SolrZkClient.ZkCon
int followers = 0;
int reportedFollowers = 0;
int leaders = 0;
boolean dynamicReconfig = false;
final List<String> errors = new ArrayList<>();
zkStatus.put("ensembleSize", zookeepers.size());
zkStatus.put("zkHost", zkHost);
Expand All @@ -143,7 +144,6 @@ protected Map<String, Object> getZkStatus(String zkHost, List<SolrZkClient.ZkCon
}
if (zk.role != null) {
stat.put("role", zk.role);
dynamicReconfig = true;
}
} catch (SolrException se) {
log.warn("Failed talking to zookeeper " + zkClientHostPort, se);
Expand Down