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

fix the exception handlig.

Browse Source 
Signed-off-by: Jianfei Hu <hujianfei258@gmail.com>
This commit is contained in:
Jianfei Hu 2023-10-31 05:06:08 +00:00
parent 573054d755
commit e231d063fb
2 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -27,7 +27,6 @@
# include <fstream>
# include <base/EnumReflection.h>
/// TODO: these changes do not need to be under AWS_S3. consider to remove or make it separate file libraries.
#include <boost/algorithm/string.hpp>
#include <boost/algorithm/string/split.hpp>
@ -236,7 +235,7 @@ std::shared_ptr<AWSEC2MetadataClient> InitEC2MetadataClient(const Aws::Client::C
return std::make_shared<AWSEC2MetadataClient>(client_configuration, endpoint.c_str());
}
std::variant<String, std::exception_ptr> AWSEC2MetadataClient::getAvailabilityZoneOrException()
String AWSEC2MetadataClient::getAvailabilityZoneOrException()
{
Poco::URI uri(awsMetadataEndpoint() + EC2_AVAILABILITY_ZONE_RESOURCE);
Poco::Net::HTTPClientSession session(uri.getHost(), uri.getPort());
@ -255,7 +254,7 @@ std::variant<String, std::exception_ptr> AWSEC2MetadataClient::getAvailabilityZo
return response_data;
}
std::variant<String, std::exception_ptr> getGCPAvailabilityZoneOrException()
String getGCPAvailabilityZoneOrException()
{
Poco::URI uri("http://169.254.169.254/computeMetadata/v1/instance/zone");
Poco::Net::HTTPClientSession session(uri.getHost(), uri.getPort());
@ -283,17 +282,22 @@ String getRunningAvailabilityZone()
{
LOG_INFO(&Poco::Logger::get("Application"), "Trying to detect the availability zone.");
auto aws_az_or_exception = AWSEC2MetadataClient::getAvailabilityZoneOrException();
if (const auto * aws_az = std::get_if<std::string>(&aws_az_or_exception))
return *aws_az;
try{
auto aws_az = AWSEC2MetadataClient::getAvailabilityZoneOrException();
return aws_az;
}
catch (const DB::Exception & aws_ex)
{
try{
auto gcp_zone = getGCPAvailabilityZoneOrException();
if (const auto * gcp_az = std::get_if<std::string>(&gcp_zone))
return *gcp_az;
/// TODO(incfly): Add Azure support.
throw DB::Exception(ErrorCodes::UNSUPPORTED_METHOD, "Failed to find the availability zone, tried both AWS and GCP");
return gcp_zone;
}
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());
}
}
}
AWSEC2InstanceProfileConfigLoader::AWSEC2InstanceProfileConfigLoader(const std::shared_ptr<AWSEC2MetadataClient> & client_, bool use_secure_pull_)

2
src/IO/S3/Credentials.h
View File

@ -58,7 +58,7 @@ public:
private:
std::pair<Aws::String, Aws::Http::HttpResponseCode> getEC2MetadataToken(const std::string & user_agent_string) const;
static std::variant<String, std::exception_ptr> getAvailabilityZoneOrException();
static String getAvailabilityZoneOrException();
const Aws::String endpoint;
mutable std::recursive_mutex token_mutex;