tool
/
starrocks
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "[Feature] upgrade staros/starlet versions" (#23775) 

Reverts StarRocks/starrocks#23762
This commit is contained in:
Kevin Cai 2023-05-19 16:36:35 +08:00 committed by GitHub
parent 23e1167cc0
commit 859cfd0f9c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 5 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
be/CMakeLists.txt
View File

@ -409,12 +409,6 @@ if ("${USE_STAROS}" STREQUAL "ON")
message(STATUS " include: ${prometheus-cpp_INCLUDE_DIR}")
include_directories(SYSTEM ${prometheus-cpp_INCLUDE_DIR})
find_package(azure-identity-cpp CONFIG REQUIRED)
find_package(azure-storage-blobs-cpp CONFIG REQUIRED)
find_package(azure-core-cpp CONFIG REQUIRED)
find_package(azure-storage-common-cpp CONFIG REQUIRED)
set(AZURE_SDK_LIB Azure::azure-identity Azure::azure-storage-blobs Azure::azure-core Azure::azure-storage-common)
add_library(starlet_fslib_all STATIC IMPORTED GLOBAL)
set_target_properties(starlet_fslib_all PROPERTIES IMPORTED_LOCATION ${STARLET_LIBS}/libstarlet_fslib_all.a)
@ -425,7 +419,6 @@ if ("${USE_STAROS}" STREQUAL "ON")
gRPC::grpc++
starlet_fslib_all
prometheus-cpp::core
${AZURE_SDK_LIB}
)
endif()

15
be/src/service/staros_worker.cpp
View File

@ -208,21 +208,6 @@ absl::StatusOr<std::shared_ptr<fslib::FileSystem>> StarOSWorker::build_filesyste
scheme = "hdfs://";
localconf[fslib::kSysRoot] = info.path_info.full_path();
break;
case staros::FileStoreType::AZBLOB:
scheme = "azblob://";
{
localconf[fslib::kSysRoot] = info.path_info.full_path();
localconf[fslib::kAzBlobEndpoint] = info.path_info.fs_info().azblob_fs_info().endpoint();
auto& credential = info.path_info.fs_info().azblob_fs_info().credential();
localconf[fslib::kAzBlobSharedKey] = credential.shared_key();
localconf[fslib::kAzBlobSASToken] = credential.sas_token();
localconf[fslib::kAzBlobTenantId] = credential.tenant_id();
localconf[fslib::kAzBlobClientId] = credential.client_id();
localconf[fslib::kAzBlobClientSecret] = credential.client_secret();
localconf[fslib::kAzBlobClientCertificatePath] = credential.client_certificate_path();
localconf[fslib::kAzBlobAuthorityHost] = credential.authority_host();
}
break;
default:
return absl::InvalidArgumentError("Unknown shard storage scheme!");
}

8
build.sh
View File

@ -314,14 +314,6 @@ if [ ${BUILD_BE} -eq 1 ] ; then
-Dabsl_DIR=${STARLET_INSTALL_DIR}/third_party/lib/cmake/absl \
-DgRPC_DIR=${STARLET_INSTALL_DIR}/third_party/lib/cmake/grpc \
-Dprometheus-cpp_DIR=${STARLET_INSTALL_DIR}/third_party/lib/cmake/prometheus-cpp \
-DCURL_LIBRARY=${STARROCKS_THIRDPARTY}/installed/lib/libcurl.a \
-DCURL_INCLUDE_DIR=${STARROCKS_THIRDPARTY}/installed/include \
-DLIBXML2_INCLUDE_DIR=${STARLET_INSTALL_DIR}/third_party/include/libxml2 \
-DLIBXML2_LIBRARY=${STARLET_INSTALL_DIR}/third_party/lib/libxml2.a \
-Dazure-core-cpp_DIR=${STARLET_INSTALL_DIR}/third_party/share/azure-core-cpp \
-Dazure-identity-cpp_DIR=${STARLET_INSTALL_DIR}/third_party/share/azure-identity-cpp \
-Dazure-storage-common-cpp_DIR=${STARLET_INSTALL_DIR}/third_party/share/azure-storage-common-cpp \
-Dazure-storage-blobs-cpp_DIR=${STARLET_INSTALL_DIR}/third_party/share/azure-storage-blobs-cpp \
-Dstarlet_DIR=${STARLET_INSTALL_DIR}/starlet_install/lib/cmake ..
else
${CMAKE_CMD} -G "${CMAKE_GENERATOR}" \

2
docker/dockerfiles/dev-env/dev-env.Dockerfile
View File

@ -22,7 +22,7 @@ ARG predownload_thirdparty=false
ARG thirdparty_url=https://cdn-thirdparty.starrocks.com/starrocks-thirdparty-main-20230317.tar
ARG commit_id
# check thirdparty/starlet-artifacts-version.sh, to get the right tag
ARG starlet_tag=v3.1-rc0
ARG starlet_tag=v1.0.1
# build for which linux distro: centos7|ubuntu
ARG distro=ubuntu

4
fe/fe-core/pom.xml
View File

@ -705,12 +705,12 @@ under the License.
<dependency>
<groupId>com.starrocks</groupId>
<artifactId>starclient</artifactId>
<version>3.1-rc0</version>
<version>0.2.7</version>
</dependency>
<dependency>
<groupId>com.starrocks</groupId>
<artifactId>starmanager</artifactId>
<version>3.1-rc0</version>
<version>0.2.7</version>
</dependency>
<!-- https://mvnrepository.com/artifact/io.opentelemetry/opentelemetry-api -->

21
fe/fe-core/src/main/java/com/starrocks/common/Config.java
View File

@ -2042,27 +2042,6 @@ public class Config extends ConfigBase {
// @ConfField
// public static String aws_s3_enable_ssl = "true";
// azure blob
@ConfField
public static String azure_blob_endpoint = "";
@ConfField
public static String azure_blob_path = "";
@ConfField
public static String azure_blob_shared_key = "";
@ConfField
public static String azure_blob_sas_token = "";
@ConfField
public static String azure_blob_tenant_id = "";
@ConfField
public static String azure_blob_client_id = "";
@ConfField
public static String azure_blob_client_secret = "";
@ConfField
public static String azure_blob_client_certificate_path = "";
@ConfField
public static String azure_blob_authority_host = "";
// ***********************************************************
// * END: of Cloud native meta server related configurations
// ***********************************************************

21
fe/fe-core/src/main/java/com/starrocks/staros/StarMgrServer.java
View File

@ -152,27 +152,8 @@ public class StarMgrServer {
com.staros.util.Config.SIMPLE_CREDENTIAL_ACCESS_KEY_SECRET = Config.aws_s3_secret_key;
com.staros.util.Config.ASSUME_ROLE_CREDENTIAL_ARN = Config.aws_s3_iam_role_arn;
com.staros.util.Config.ASSUME_ROLE_CREDENTIAL_EXTERNAL_ID = Config.aws_s3_external_id;
} else if (com.staros.util.Config.DEFAULT_FS_TYPE.equalsIgnoreCase("AZBLOB")) {
com.staros.util.Config.AZURE_BLOB_ENDPOINT = Config.azure_blob_endpoint;
com.staros.util.Config.AZURE_BLOB_PATH = Config.azure_blob_path;
com.staros.util.Config.AZURE_BLOB_SHARED_KEY = Config.azure_blob_shared_key;
com.staros.util.Config.AZURE_BLOB_SAS_TOKEN = Config.azure_blob_sas_token;
com.staros.util.Config.AZURE_BLOB_TENANT_ID = Config.azure_blob_tenant_id;
com.staros.util.Config.AZURE_BLOB_CLIENT_ID = Config.azure_blob_client_id;
com.staros.util.Config.AZURE_BLOB_CLIENT_SECRET = Config.azure_blob_client_secret;
com.staros.util.Config.AZURE_BLOB_CLIENT_CERTIFICATE_PATH = Config.azure_blob_client_certificate_path;
com.staros.util.Config.AZURE_BLOB_AUTHORITY_HOST = Config.azure_blob_authority_host;
if (com.staros.util.Config.AZURE_BLOB_ENDPOINT.isEmpty()) {
LOG.error("The configuration item \"azure_blob_endpoint\" is empty.");
System.exit(-1);
}
if (com.staros.util.Config.AZURE_BLOB_PATH.isEmpty()) {
LOG.error("The configuration item \"azure_blob_path\" is empty.");
System.exit(-1);
}
} else {
LOG.error(
"The configuration item \"cloud_native_storage_type = {}\" is invalid, must be HDFS or S3 or AZBLOB.",
LOG.error("The configuration item \"cloud_native_storage_type = {}\" is invalid, must be HDFS or S3.",
Config.cloud_native_storage_type);
System.exit(-1);
}

8
run-be-ut.sh
View File

@ -155,14 +155,6 @@ if [ "${USE_STAROS}" == "ON" ]; then
-Dabsl_DIR=${STARLET_INSTALL_DIR}/third_party/lib/cmake/absl \
-DgRPC_DIR=${STARLET_INSTALL_DIR}/third_party/lib/cmake/grpc \
-Dprometheus-cpp_DIR=${STARLET_INSTALL_DIR}/third_party/lib/cmake/prometheus-cpp \
-DCURL_LIBRARY=${STARROCKS_THIRDPARTY}/installed/lib/libcurl.a \
-DCURL_INCLUDE_DIR=${STARROCKS_THIRDPARTY}/installed/include \
-DLIBXML2_INCLUDE_DIR=${STARLET_INSTALL_DIR}/third_party/include/libxml2 \
-DLIBXML2_LIBRARY=${STARLET_INSTALL_DIR}/third_party/lib/libxml2.a \
-Dazure-core-cpp_DIR=${STARLET_INSTALL_DIR}/third_party/share/azure-core-cpp \
-Dazure-identity-cpp_DIR=${STARLET_INSTALL_DIR}/third_party/share/azure-identity-cpp \
-Dazure-storage-common-cpp_DIR=${STARLET_INSTALL_DIR}/third_party/share/azure-storage-common-cpp \
-Dazure-storage-blobs-cpp_DIR=${STARLET_INSTALL_DIR}/third_party/share/azure-storage-blobs-cpp \
-Dstarlet_DIR=${STARLET_INSTALL_DIR}/starlet_install/lib/cmake ..
else
${CMAKE_CMD} -G "${CMAKE_GENERATOR}" \

2
thirdparty/starlet-artifacts-version.sh vendored
View File

@ -9,4 +9,4 @@
# https://hub.docker.com/r/starrocks/starlet-artifacts-centos7/tags
#
# Update the following tag when STARLET releases a new version.
export STARLET_ARTIFACTS_TAG=v3.1-rc0
export STARLET_ARTIFACTS_TAG=v1.0.1