chore: try fix sharing ci and fix comments

Author: ZhiHanZ

.github/actions/artifact_download/action.yml

@@ -59,8 +59,12 @@ runs:
         aws s3 cp \
           s3://databend-ci/${{ inputs.profile }}/${{ inputs.sha }}/${{ inputs.target }}/${{ inputs.category }}/ \
           ${{ steps.info.outputs.path }}/ --recursive --exclude "*" --include "databend-*" --no-progress
+        aws s3 cp \
+          s3://databend-ci/${{ inputs.profile }}/${{ inputs.sha }}/${{ inputs.target }}/${{ inputs.category }}/ \
+          ${{ steps.info.outputs.path }}/ --recursive --exclude "*" --include "open-sharing" --no-progress || true
 
     - name: make artifacts excutable
       shell: bash
       run: |
         chmod +x ${{ steps.info.outputs.path }}/databend-*
+        chmod +x ${{ steps.info.outputs.path }}/open-sharing

scripts/ci/ci-run-stateful-tests-standalone-s3.sh

@@ -26,10 +26,19 @@ echo "calling test suite"
 echo "Starting standalone DatabendQuery(debug)"
 ./scripts/ci/deploy/databend-query-standalone.sh
 
-export ALLOW_SHARING=false
+# only expected to get adopted in stateful tests
+if [[ "$ALLOW_SHARING" == "true" ]]; then
+	./scripts/ci/deploy/databend-query-sharing.sh
+fi
 
 SCRIPT_PATH="$(cd "$(dirname "$0")" >/dev/null 2>&1 && pwd)"
 cd "$SCRIPT_PATH/../../tests" || exit
 
 echo "Starting databend-test"
+
 ./databend-test $1 --mode 'standalone' --run-dir 1_stateful
+
+# only expected to get adopted in stateful tests
+if [[ "$ALLOW_SHARING" == "true" ]]; then
+	./databend-test $1 --mode 'standalone' --run-dir 3_stateful_sharing
+fi

scripts/ci/deploy/databend-query-sharing.sh

@@ -0,0 +1,26 @@
+#!/bin/bash
+# Copyright 2022 The Databend Authors.
+# SPDX-License-Identifier: Apache-2.0.
+set -e
+
+SCRIPT_PATH="$(cd "$(dirname "$0")" >/dev/null 2>&1 && pwd)"
+cd "$SCRIPT_PATH/../../.." || exit
+BUILD_PROFILE=${BUILD_PROFILE:-debug}
+
+echo "*************************************"
+echo "* Test on Databend openSharing endpoint    *"
+echo "* it will start a node from another tenant *"
+echo "* Please make sure that S3 backend         *"
+echo "* is ready, and configured properly.       *"
+echo "*************************************"
+echo "Start open-sharing..."
+export TENANT=test_tenant
+nohup target/${BUILD_PROFILE}/open-sharing &
+python3 scripts/ci/wait_tcp.py --timeout 5 --port 33003
+
+echo 'Start databend-query...'
+export STORAGE_S3_ROOT=shared
+
+nohup target/${BUILD_PROFILE}/databend-query -c scripts/ci/deploy/config/databend-query-node-shared.toml &
+
+python3 scripts/ci/wait_tcp.py --timeout 5 --port 53307

scripts/ci/deploy/databend-query-standalone.sh

@@ -30,24 +30,3 @@ nohup target/${BUILD_PROFILE}/databend-query -c scripts/ci/deploy/config/databen
 
 echo "Waiting on databend-query 10 seconds..."
 python3 scripts/ci/wait_tcp.py --timeout 5 --port 3307
-
-# only expected to get adopted in stateful tests
-if [[ "$ALLOW_SHARING" == "true" ]]; then
-	echo "*************************************"
-	echo "* Test on Databend openSharing endpoint    *"
-	echo "* it will start a node from another tenant *"
-	echo "* Please make sure that S3 backend         *"
-	echo "* is ready, and configured properly.       *"
-	echo "*************************************"
-	echo "Start open-sharing..."
-	export TENANT=test_tenant
-	nohup target/${BUILD_PROFILE}/open-sharing &
-	python3 scripts/ci/wait_tcp.py --timeout 5 --port 33003
-
-	echo 'Start databend-query...'
-	export STORAGE_S3_ROOT=shared
-
-	nohup target/${BUILD_PROFILE}/databend-query -c scripts/ci/deploy/config/databend-query-node-shared.toml &
-
-	python3 scripts/ci/wait_tcp.py --timeout 5 --port 53307
-fi

src/binaries/opensharing/main.rs

@@ -24,8 +24,7 @@ use sharing_endpoint::services::SharingServices;
 #[tokio::main]
 async fn main() -> Result<(), std::io::Error> {
     let config = Config::load().expect("cfgs");
-    println!("config: {:?}", config);
-    SharingServices::init(config)
+    SharingServices::init(config.clone())
         .await
         .expect("failed to init sharing service");
     let app = Route::new()
@@ -35,8 +34,7 @@ async fn main() -> Result<(), std::io::Error> {
         )
         .with(SharingAuth);
 
-    // TODO(zhihanz): remove the hard coded port into a config
-    Server::new(TcpListener::bind("127.0.0.1:33003"))
+    Server::new(TcpListener::bind(config.share_endpoint_address))
         .run(app)
         .await
 }

src/query/sharing-endpoint/src/configs/inner.rs

@@ -20,6 +20,7 @@ use super::outer_v0::Config as OuterV0Config;
 #[derive(Clone, Debug, PartialEq, Eq)]
 pub struct Config {
     pub tenant: String,
+    pub share_endpoint_address: String,
     pub storage: StorageConfig,
 }
 
@@ -52,6 +53,7 @@ impl Default for Config {
     fn default() -> Self {
         Self {
             tenant: "".to_string(),
+            share_endpoint_address: "".to_string(),
             storage: StorageConfig::default(),
         }
     }

src/query/sharing-endpoint/src/configs/outer_v0.rs

@@ -28,6 +28,8 @@ use super::inner::Config as InnerConfig;
 pub struct Config {
     #[clap(long, default_value = "")]
     pub tenant: String,
+    #[clap(long, default_value = "127.0.0.1:33003")]
+    pub share_endpoint_address: String,
     // Storage backend config.
     #[clap(flatten)]
     pub storage: common_config::StorageConfig,
@@ -43,6 +45,7 @@ impl From<Config> for InnerConfig {
     fn from(x: Config) -> Self {
         InnerConfig {
             tenant: x.tenant,
+            share_endpoint_address: x.share_endpoint_address,
             storage: x.storage.try_into().expect("StorageConfig"),
         }
     }
@@ -52,6 +55,7 @@ impl From<InnerConfig> for Config {
     fn from(inner: InnerConfig) -> Self {
         Self {
             tenant: inner.tenant,
+            share_endpoint_address: inner.share_endpoint_address,
             storage: inner.storage.into(),
         }
     }

src/query/sharing-endpoint/src/handlers.rs

@@ -38,7 +38,6 @@ pub async fn presign_files(
         request_files,
         None,
     );
-    println!("input: {:?}", input.clone());
     return match SharingAccessor::get_presigned_files(&input).await {
         Ok(output) => Ok(Json(output)),
         Err(e) => Err(BadRequest(e)),

src/query/sharing-endpoint/src/middlewares.rs

@@ -41,7 +41,6 @@ impl<E: Endpoint> Endpoint for SharingAuthImpl<E> {
     // TODO(zhihanz) current implementation only used for stateless test
     // for production usage, we need to implement a middleware with JWT authentication
     async fn call(&self, mut req: Request) -> Result<Self::Output> {
-        println!("req: {:?}", req);
 
         // decode auth header from bearer base64
         let auth_header = req
@@ -54,7 +53,6 @@ impl<E: Endpoint> Endpoint for SharingAuthImpl<E> {
         let auth_header = auth_header[1];
         let auth_header = base64::decode(auth_header).unwrap();
         let auth_header = String::from_utf8(auth_header).unwrap();
-        println!("auth_header: {:?}", auth_header);
         req.extensions_mut()
             .insert(Credentials { token: auth_header });
         // add json content type if not provided