diff --git a/.github/workflows/interactive.yml b/.github/workflows/interactive.yml index 0c6bde4fd96c..716c79ac2627 100644 --- a/.github/workflows/interactive.yml +++ b/.github/workflows/interactive.yml @@ -109,7 +109,7 @@ jobs: name: interactive_build-${{ github.sha }} - name: Setup tmate session - if: true + if: false uses: mxschmitt/action-tmate@v3 - name: Extract build artifacts diff --git a/flex/engines/http_server/handler/graph_db_http_handler.cc b/flex/engines/http_server/handler/graph_db_http_handler.cc index 319920459058..c530a1590569 100644 --- a/flex/engines/http_server/handler/graph_db_http_handler.cc +++ b/flex/engines/http_server/handler/graph_db_http_handler.cc @@ -176,7 +176,7 @@ class stored_proc_handler : public StoppableHandler { bool start() override { if (get_executors()[StoppableHandler::shard_id()].size() > 0) { - LOG(ERROR) << "The actors have been already created!"; + VLOG(1) << "The actors have been already created!"; return false; } return StoppableHandler::start_scope( diff --git a/flex/engines/http_server/handler/graph_db_http_handler.h b/flex/engines/http_server/handler/graph_db_http_handler.h index 6bc5c906910e..22090e66dc41 100644 --- a/flex/engines/http_server/handler/graph_db_http_handler.h +++ b/flex/engines/http_server/handler/graph_db_http_handler.h @@ -69,7 +69,7 @@ class StoppableHandler : public seastar::httpd::handler_base { } catch (const std::exception& e) { // In case the scope is already cancelled, we should ignore the // exception. - LOG(INFO) << "Failed to cancel IC scope: " << e.what(); + VLOG(1) << "Failed to cancel IC scope: " << e.what(); } func(); return seastar::make_ready_future<>(); diff --git a/flex/interactive/sdk/python/gs_interactive/tests/conftest.py b/flex/interactive/sdk/python/gs_interactive/tests/conftest.py index 94f0b34a25f2..34e4372d4f5d 100644 --- a/flex/interactive/sdk/python/gs_interactive/tests/conftest.py +++ b/flex/interactive/sdk/python/gs_interactive/tests/conftest.py @@ -478,4 +478,4 @@ def start_service_on_graph(interactive_session, graph_id: str): resp = interactive_session.start_service(StartServiceRequest(graph_id=graph_id)) assert resp.is_ok() # wait three second to let compiler get the new graph - time.sleep(3) + time.sleep(10) diff --git a/interactive_engine/compiler/src/main/java/com/alibaba/graphscope/common/ir/meta/fetcher/DynamicIrMetaFetcher.java b/interactive_engine/compiler/src/main/java/com/alibaba/graphscope/common/ir/meta/fetcher/DynamicIrMetaFetcher.java index 265d88fe721e..4801aaa1ebcf 100644 --- a/interactive_engine/compiler/src/main/java/com/alibaba/graphscope/common/ir/meta/fetcher/DynamicIrMetaFetcher.java +++ b/interactive_engine/compiler/src/main/java/com/alibaba/graphscope/common/ir/meta/fetcher/DynamicIrMetaFetcher.java @@ -79,28 +79,27 @@ public Optional fetch() { private synchronized void syncMeta() { try { IrMeta meta = this.reader.readMeta(); - logger.debug( + logger.info( "schema from remote: {}", (meta == null) ? null : meta.getSchema().getSchemaSpec(Type.IR_CORE_IN_JSON)); - // if the graph id or schema version is changed, we need to update the statistics - if (this.currentState == null - // NOTE(lei): We could not use graph id to determine whether the graph is - // changed. Because the graph id is generated by the graph store, it may be - // different. - // || !this.currentState.getGraphId().equals(meta.getGraphId()) - || !this.currentState - .getSchema() - .getVersion() - .equals(meta.getSchema().getVersion())) { - this.statsState = StatsState.INITIALIZED; - this.currentState = - new IrMetaStats( - meta.getGraphId(), - meta.getSnapshotId(), - meta.getSchema(), - meta.getStoredProcedures(), - null); - } + // NOTE(lei): We could not use graph id to determine whether the graph is + // changed. Because the graph id is generated by the graph store, it may be + // different. So currently we need to update the schema and statistics every time. + // if (this.currentState == null + // || !this.currentState.getGraphId().equals(meta.getGraphId()) + // || !this.currentState + // .getSchema() + // .getVersion() + // .equals(meta.getSchema().getVersion())) { + this.statsState = StatsState.INITIALIZED; + this.currentState = + new IrMetaStats( + meta.getGraphId(), + meta.getSnapshotId(), + meta.getSchema(), + meta.getStoredProcedures(), + null); + // } boolean statsEnabled = getStatsEnabled(this.currentState.getGraphId()); if (statsEnabled && this.statsState != StatsState.SYNCED || (!statsEnabled && this.statsState != StatsState.MOCKED)) {