thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-12-02 12:32:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

style fix and revert src/Coordination/KeeperSnapshotManagerS3.h

Browse Source 
Signed-off-by: Jianfei Hu <hujianfei258@gmail.com>
This commit is contained in:
Jianfei Hu 2023-10-31 18:48:59 +00:00
parent f902243c05
commit 3fff813659
2 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Coordination/KeeperSnapshotManagerS3.h
View File

@ -9,7 +9,6 @@
#include <Coordination/KeeperSnapshotManager.h>
#if USE_AWS_S3
#include <IO/S3/PocoHTTPClient.h>
#include <Common/ConcurrentBoundedQueue.h>
#include <Common/ThreadPool.h>
@ -66,8 +65,6 @@ public:
void updateS3Configuration(const Poco::Util::AbstractConfiguration &, const MultiVersion<Macros>::Version &) {}
void uploadSnapshot(const SnapshotFileInfo &, [[maybe_unused]] bool async_upload = true) {}
std::string getAvaibilityZone() const { return ""; }
void startup(const Poco::Util::AbstractConfiguration &, const MultiVersion<Macros>::Version &) {}
void shutdown() {}

8
src/IO/S3/Credentials.cpp
View File

@ -261,7 +261,7 @@ String getGCPAvailabilityZoneOrException()
Poco::Net::HTTPClientSession session(uri.getHost(), uri.getPort());
Poco::Net::HTTPRequest request(Poco::Net::HTTPRequest::HTTP_GET, uri.getPath());
Poco::Net::HTTPResponse response;
request.set("Metadata-Flavor", "Google");
request.set("Metadata-Flavor", "Google");
session.sendRequest(request);
std::istream& rs = session.receiveResponse(response);
if (response.getStatus() != Poco::Net::HTTPResponse::HTTP_OK) {
@ -273,8 +273,7 @@ String getGCPAvailabilityZoneOrException()
Strings zone_info;
boost::split(zone_info, response_data, boost::is_any_of("/"));
if (zone_info.size() != 4) {
throw DB::Exception(ErrorCodes::GCP_ERROR,
"Invalid format of GCP zone information, expect projects/<project-number>/zones/<zone-value>, got {}", response_data);
throw DB::Exception(ErrorCodes::GCP_ERROR, "Invalid format of GCP zone information, expect projects/<project-number>/zones/<zone-value>, got {}", response_data);
}
return zone_info[3];
}
@ -294,8 +293,7 @@ std::variant<String, std::exception_ptr> getRunningAvailabilityZoneImpl()
}
catch(const DB::Exception & gcp_ex)
{
throw DB::Exception(ErrorCodes::UNSUPPORTED_METHOD,
"Failed to find the availability zone, tried AWS, GCP. AWS Error {}\n GCP Error {}", aws_ex.displayText(), gcp_ex.displayText());
throw DB::Exception(ErrorCodes::UNSUPPORTED_METHOD, "Failed to find the availability zone, tried AWS, GCP. AWS Error {}\n GCP Error {}", aws_ex.displayText(), gcp_ex.displayText());
}
}
}