Skip to content

log sanitation on output of jobs #8890

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

Merged
DaanHoogland merged 2 commits into from
Apr 23, 2024
Merged

log sanitation on output of jobs #8890

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bb5b9f7
log sanitation on output of jobs
DaanHoogland Apr 8, 2024
ef09e5b
Update services/secondary-storage/server/src/main/java/org/apache/clo…
DaanHoogland Apr 19, 2024
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
9 changes: 4 additions & 5 deletions ...ver/src/main/java/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,6 @@
import org.apache.commons.io.FileUtils;
import org.apache.commons.io.FilenameUtils;
import org.apache.commons.lang3.BooleanUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.http.HttpEntity;
import org.apache.http.HttpResponse;
import org.apache.http.NameValuePair;
Expand Down Expand Up @@ -169,6 +168,7 @@
import com.cloud.utils.LogUtils;
import com.cloud.utils.NumbersUtil;
import com.cloud.utils.Pair;
import com.cloud.utils.StringUtils;
import com.cloud.utils.SwiftUtil;
import com.cloud.utils.exception.CloudRuntimeException;
import com.cloud.utils.net.NetUtils;
Expand Down Expand Up @@ -3106,17 +3106,16 @@ protected String parseCifsMountOptions(URI uri) {
extraOpts.append(name + "=" + nvp.getValue() + ",");
}

if (logger.isDebugEnabled()) {
logger.error("extraOpts now " + extraOpts);
}
String extraOptions = extraOpts.toString();
logger.debug("extraOpts now ", ()->StringUtils.cleanString(extraOptions));

if (!foundUser || !foundPswd) {
String errMsg = "Missing user and password from URI. Make sure they" + "are in the query string and separated by '&'. E.g. "
+ "cifs://example.com/some_share?user=foo&password=bar";
logger.error(errMsg);
throw new CloudRuntimeException(errMsg);
}
return extraOpts.toString();
return extraOptions;
}

protected boolean mountExists(String localRootPath, URI uri) {
Expand Down