Skip to content

RBD: support multiple MON hosts #4380

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

Closed
ustcweizhou wants to merge 1 commit into from
Closed

RBD: support multiple MON hosts #4380

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 6 additions & 2 deletions ...pache/cloudstack/storage/datastore/lifecycle/CloudStackPrimaryDataStoreLifeCycleImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,9 @@ public DataStore initialize(Map<String, Object> dsInfos) {

URI uri = null;
try {
if (url != null && url.startsWith("rbd://")) {
Copy link
Contributor

@sureshanaparti sureshanaparti Oct 7, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

in case the url scheme is not case sensitive, can use:

Suggested change
if (url != null && url.startsWith("rbd://")) {
if (url != null && url..toLowerCase().startsWith("rbd://")) {

(or)

Suggested change
if (url != null && url.startsWith("rbd://")) {
if (StringUtils.startsWithIgnoreCase(url, "rbd://")) {

url = url.replace(",", "/");
}
uri = new URI(UriUtils.encodeURIComponent(url));
if (uri.getScheme() == null) {
throw new InvalidParameterValueException("scheme is null " + url + ", add nfs:// (or cifs://) as a prefix");
Expand Down Expand Up @@ -245,9 +248,10 @@ public DataStore initialize(Map<String, Object> dsInfos) {
port = 0;
}
parameters.setType(StoragePoolType.RBD);
parameters.setHost(storageHost);
int lastSlash = hostPath.lastIndexOf("/");
parameters.setHost(storageHost + hostPath.substring(0, lastSlash).replace("/", ","));
parameters.setPort(port);
parameters.setPath(hostPath.replaceFirst("/", ""));
parameters.setPath(hostPath.substring(lastSlash + 1));
parameters.setUserInfo(userInfo);
} else if (scheme.equalsIgnoreCase("PreSetup")) {
parameters.setType(StoragePoolType.PreSetup);
Expand Down