Merge pull request #9225 from Xuanwo/bump-opendal

feat: Bump opendal to fix aws IMDSv2 credential

Author: mergify[bot]

.github/actions/test_unit/action.yml

@@ -14,36 +14,11 @@ runs:
         bypass_env_vars: RUSTFLAGS,RUSTDOCFLAGS,RUST_TEST_THREADS,RUST_LOG,RUST_BACKTRACE
 
     - shell: bash
-      run: cargo -Z sparse-registry test --no-fail-fast
+      run: cargo -Z sparse-registry test
       env:
         RUST_TEST_THREADS: "2"
-        RUST_LOG: ERROR
+        RUST_LOG: DEBUG
         RUST_BACKTRACE: full
-        # RUSTFLAGS: '-Zprofile -Ccodegen-units=1 -Cinline-threshold=0 -Clink-dead-code -Coverflow-checks=off -Zpanic_abort_tests --cfg tokio_unstable'
-        # RUSTDOCFLAGS: '-Zprofile -Ccodegen-units=1 -Cinline-threshold=0 -Clink-dead-code -Coverflow-checks=off -Zpanic_abort_tests'
-
-    # Temporarily disable test coverage checks to save CI resources.
-    # The main purpose is to avoid OOM due to build for specific target.
-    #
-    # Instructions
-    # - `uncomment/enable`: If we self-host the CI or split the repo (especially, common-functions) to a finer granularity.
-    # - `remove`: If we lack the need for test coverage, or adopt a new solution.
-
-    # - name: Install grcov
-    #   uses: actions-rs/cargo@v1
-    #   with:
-    #     command: install
-    #     args: grcov
-
-    # - name: Run code coverage
-    #   uses: actions-rs/grcov@v0.1.5
-    #   id: coverage
-
-    # - name: Upload to codecov.io
-    #   uses: codecov/codecov-action@v1
-    #   with:
-    #     token: ${{ inputs.codecov_token }}
-    #     file: ${{ steps.coverage.outputs.report }}
 
     - name: Upload failure
       if: failure()

Cargo.lock

@@ -36,6 +36,7 @@ use crate::plan::PartInfoPtr;
 use crate::plan::Partitions;
 use crate::table::Table;
 
+#[derive(Debug)]
 pub struct ProcessInfo {
     pub id: String,
     pub typ: String,

src/query/catalog/src/table_context.rs

@@ -422,7 +422,7 @@ async fn test_pagination() -> Result<()> {
     Ok(())
 }
 
-#[tokio::test(flavor = "multi_thread", worker_threads = 1)]
+#[tokio::test(flavor = "current_thread")]
 async fn test_http_session() -> Result<()> {
     let _guard = TestGlobalServices::setup(ConfigBuilder::create().build()).await?;
 
@@ -768,7 +768,7 @@ async fn post_json_to_endpoint(
     check_response(response).await
 }
 
-#[tokio::test(flavor = "multi_thread", worker_threads = 1)]
+#[tokio::test(flavor = "current_thread")]
 async fn test_auth_jwt() -> Result<()> {
     let user_name = "root";
 
@@ -897,7 +897,7 @@ async fn assert_auth_current_role(
     Ok(())
 }
 
-#[tokio::test(flavor = "multi_thread", worker_threads = 1)]
+#[tokio::test(flavor = "current_thread")]
 async fn test_auth_jwt_with_create_user() -> Result<()> {
     let user_name = "user1";
 
@@ -1002,7 +1002,7 @@ async fn test_http_handler_tls_server() -> Result<()> {
     Ok(())
 }
 
-#[tokio::test(flavor = "multi_thread", worker_threads = 1)]
+#[tokio::test(flavor = "current_thread")]
 async fn test_http_handler_tls_server_failed_case_1() -> Result<()> {
     let config = ConfigBuilder::create()
         .http_handler_tls_server_key(TEST_SERVER_KEY)
@@ -1074,7 +1074,7 @@ async fn test_http_service_tls_server_mutual_tls() -> Result<()> {
 }
 
 // cannot connect with server unless it have CA signed identity
-#[tokio::test(flavor = "multi_thread", worker_threads = 1)]
+#[tokio::test(flavor = "current_thread")]
 async fn test_http_service_tls_server_mutual_tls_failed() -> Result<()> {
     let _guard = TestGlobalServices::setup(
         ConfigBuilder::create()
@@ -1470,7 +1470,7 @@ async fn test_affect() -> Result<()> {
     Ok(())
 }
 
-#[tokio::test(flavor = "multi_thread", worker_threads = 1)]
+#[tokio::test(flavor = "current_thread")]
 async fn test_auth_configured_user() -> Result<()> {
     let user_name = "conf_user";
     let pass_word = "conf_user_pwd";

src/query/service/tests/it/servers/http/http_query_handlers.rs

@@ -12,16 +12,14 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use std::time::Duration;
-
 use common_base::base::GlobalInstance;
 use common_config::Config;
 use common_exception::Result;
 use common_tracing::set_panic_hook;
 use databend_query::clusters::ClusterDiscovery;
 use databend_query::sessions::SessionManager;
 use databend_query::GlobalServices;
-use time::Instant;
+use tracing::debug;
 use tracing::info;
 
 pub struct TestGlobalServices;
@@ -63,16 +61,26 @@ pub struct TestGuard {
 
 impl Drop for TestGuard {
     fn drop(&mut self) {
-        // Hack: The session may be referenced by other threads. Let's try to wait.
-        let now = Instant::now();
-        while !SessionManager::instance().processes_info().is_empty() {
-            std::thread::sleep(Duration::from_millis(500));
+        debug!(
+            "test {} is finished, starting dropping all resources",
+            &self.thread_name
+        );
 
-            if now.elapsed() > Duration::from_secs(3) {
-                break;
+        // Check if session manager sill have active sessions.
+        {
+            let session_mgr = SessionManager::instance();
+            // Destory all sessions.
+            for process in session_mgr.processes_info() {
+                session_mgr.destroy_session(&process.id);
+            }
+            // Double check again.
+            for process in session_mgr.processes_info() {
+                debug!("process {process:?} still running after drop, something must be wrong");
             }
         }
 
-        GlobalInstance::drop_testing(&self.thread_name)
+        GlobalInstance::drop_testing(&self.thread_name);
+
+        debug!("test {} resources have been dropped", &self.thread_name);
     }
 }

src/query/service/tests/it/tests/sessions.rs

@@ -63,7 +63,7 @@ pub struct SettingValue {
     possible_values: Option<Vec<&'static str>>,
 }
 
-#[derive(Clone)]
+#[derive(Clone, Debug)]
 pub struct Settings {
     settings: Arc<DashMap<String, SettingValue>>,
     // TODO verify this, will tenant change during the lifetime of a given session?