From fecf934bed83dbf2d67f0f860b9e427674a59adf Mon Sep 17 00:00:00 2001 From: Lu Han Date: Thu, 28 Aug 2025 20:25:56 +1000 Subject: [PATCH 1/2] Revert "Merge pull request #21 from kindredgroup/feat/support-full-semVer-tags" This reverts commit 2e0f2c13dbe98b9bf2bc04149ff185f95b53a02d, reversing changes made to a04622d5934890fdb485a6384997d3f86a441ce3. --- .github/workflows/ghcr_publish.yml | 2 +- .github/workflows/npm_publish.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ghcr_publish.yml b/.github/workflows/ghcr_publish.yml index bf35186..d72181b 100644 --- a/.github/workflows/ghcr_publish.yml +++ b/.github/workflows/ghcr_publish.yml @@ -6,7 +6,7 @@ name: GHCR Publish on: push: tags: - - 'v[0-9]+.[0-9]+.[0-9]+(-(dev|alpha|beta|rc)[0-9]*)?' + - 'v[0-9]+.[0-9]+.[0-9]+' jobs: build: diff --git a/.github/workflows/npm_publish.yml b/.github/workflows/npm_publish.yml index f7b9f17..323bf41 100644 --- a/.github/workflows/npm_publish.yml +++ b/.github/workflows/npm_publish.yml @@ -2,7 +2,7 @@ name: CI on: push: tags: - - 'v[0-9]+.[0-9]+.[0-9]+(-(dev|alpha|beta|rc)[0-9]*)?' + - 'v[0-9]+.[0-9]+.[0-9]+' env: DEBUG: napi:* APP_NAME: scylla_pg_js From bce43c3e79a6e0e71f4b05fec85e32dbbe50ed47 Mon Sep 17 00:00:00 2001 From: Lu Han Date: Thu, 28 Aug 2025 20:26:01 +1000 Subject: [PATCH 2/2] Revert "Merge pull request #22 from kindredgroup/feat/allow-attaching-additional-metrics-on-completed-task" This reverts commit f5a004c843176f1e552f12d5b70ad152e4938648, reversing changes made to 2e0f2c13dbe98b9bf2bc04149ff185f95b53a02d. --- Cargo.lock | 12 +-- scylla_models/Cargo.toml | 2 +- scylla_models/src/lib.rs | 14 +--- scylla_operations/Cargo.toml | 2 +- scylla_operations/src/task/tests.rs | 9 ++- scylla_operations/src/update_task.rs | 3 - scylla_operations/src/update_task/tests.rs | 75 +------------------ scylla_pg_client/index.ts | 4 +- scylla_pg_client/package.json | 4 +- scylla_pg_core/Cargo.toml | 2 +- scylla_pg_js/Cargo.toml | 2 +- scylla_pg_js/index.d.ts | 2 +- scylla_pg_js/package.json | 16 ++-- scylla_pg_js/src/lib.rs | 4 +- scylla_pg_lib/Cargo.toml | 2 +- scylla_pg_lib/src/adapter.rs | 16 ++-- .../src/bin/load_get_and_lease_task.rs | 2 +- scylla_pg_lib/src/manager.rs | 13 +--- scylla_pg_lib/src/manager/tests.rs | 2 +- scylla_pg_lib/tests/get_tasks.rs | 2 +- scylla_pg_lib/tests/reset_tasks.rs | 2 +- scylla_pg_monitor/Cargo.toml | 2 +- 22 files changed, 56 insertions(+), 136 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 2199b89..222c847 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1536,7 +1536,7 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "scylla_models" -version = "0.1.34-dev1" +version = "0.1.33" dependencies = [ "chrono", "serde", @@ -1546,7 +1546,7 @@ dependencies = [ [[package]] name = "scylla_operations" -version = "0.1.34-dev1" +version = "0.1.33" dependencies = [ "async-trait", "chrono", @@ -1561,7 +1561,7 @@ dependencies = [ [[package]] name = "scylla_pg_core" -version = "0.1.34-dev1" +version = "0.1.33" dependencies = [ "async-trait", "chrono", @@ -1578,7 +1578,7 @@ dependencies = [ [[package]] name = "scylla_pg_js" -version = "0.1.34-dev1" +version = "0.1.33" dependencies = [ "chrono", "env_logger 0.11.8", @@ -1597,7 +1597,7 @@ dependencies = [ [[package]] name = "scylla_pg_lib" -version = "0.1.34-dev1" +version = "0.1.33" dependencies = [ "async-trait", "chrono", @@ -1622,7 +1622,7 @@ dependencies = [ [[package]] name = "scylla_pg_monitor" -version = "0.1.34-dev1" +version = "0.1.33" dependencies = [ "async-trait", "chrono", diff --git a/scylla_models/Cargo.toml b/scylla_models/Cargo.toml index 8200422..8097d4c 100644 --- a/scylla_models/Cargo.toml +++ b/scylla_models/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "scylla_models" -version = "0.1.34-dev1" +version = "0.1.33" edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/scylla_models/src/lib.rs b/scylla_models/src/lib.rs index 645f4d1..b236065 100644 --- a/scylla_models/src/lib.rs +++ b/scylla_models/src/lib.rs @@ -12,7 +12,7 @@ pub struct AddTaskModel { pub queue: String, } -#[derive(Debug, Default)] +#[derive(Debug)] pub struct UpdateTaskModel { pub rn: String, pub operation: UpdateOperation, @@ -21,7 +21,6 @@ pub struct UpdateTaskModel { pub worker: Option, pub progress: Option, pub task_timeout_in_secs: Option, - pub metrics: Option, } #[derive(Debug)] @@ -42,12 +41,11 @@ impl Default for GetTaskModel { } } -#[derive(Debug, Serialize, Deserialize, Clone, Eq, PartialEq, Default)] +#[derive(Debug, Serialize, Deserialize, Clone, Eq, PartialEq)] #[serde(rename_all = "camelCase")] pub enum UpdateOperation { Yield, HeartBeat, - #[default] Status, Lease, Reset, @@ -131,7 +129,6 @@ pub struct Task { pub owner: Option, pub errors: Vec, pub history: Vec, - pub metrics: Option, } impl Default for Task { fn default() -> Self { @@ -148,7 +145,6 @@ impl Default for Task { owner: None, errors: Vec::default(), history: Vec::default(), - metrics: None, } } } @@ -181,11 +177,10 @@ mod tests { status: None, worker: None, task_timeout_in_secs: None, - metrics: None, }; assert_eq!( format!("{:?}", utm), - "UpdateTaskModel { rn: \"1.2.3\", operation: HeartBeat, status: None, error: None, worker: None, progress: None, task_timeout_in_secs: None, metrics: None }" + "UpdateTaskModel { rn: \"1.2.3\", operation: HeartBeat, status: None, error: None, worker: None, progress: None, task_timeout_in_secs: None }" ); } #[test] @@ -273,7 +268,7 @@ mod tests { ..Task::default() }; // debug trait - assert_eq!(format!("{:?}", t), format!("Task {{ rn: \"\", spec: Null, status: Ready, queue: \"\", progress: 0.0, priority: 0, created: {0:?}, updated: {0:?}, deadline: None, owner: None, errors: [], history: [], metrics: None }}", t_now)); + assert_eq!(format!("{:?}", t), format!("Task {{ rn: \"\", spec: Null, status: Ready, queue: \"\", progress: 0.0, priority: 0, created: {0:?}, updated: {0:?}, deadline: None, owner: None, errors: [], history: [] }}", t_now)); // default() let t = Task { created: t_now, @@ -295,7 +290,6 @@ mod tests { owner: None, errors: Vec::default(), history: Vec::default(), - metrics: None, } ) } diff --git a/scylla_operations/Cargo.toml b/scylla_operations/Cargo.toml index acb193e..127fc8f 100644 --- a/scylla_operations/Cargo.toml +++ b/scylla_operations/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "scylla_operations" -version = "0.1.34-dev1" +version = "0.1.33" edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/scylla_operations/src/task/tests.rs b/scylla_operations/src/task/tests.rs index 02a06e9..7abd6f0 100644 --- a/scylla_operations/src/task/tests.rs +++ b/scylla_operations/src/task/tests.rs @@ -31,7 +31,9 @@ fn update_task_calls_get_and_update() { operation: UpdateOperation::Lease, status: Some(TaskStatus::Running), worker: Some("worker1".to_string()), - ..UpdateTaskModel::default() + error: None, + progress: None, + task_timeout_in_secs: None, }; let task_to_update = Task { rn: "unique_id".to_string(), @@ -56,7 +58,10 @@ fn update_task_returns_scylla_op_error() { rn: "unique_id".to_string(), operation: UpdateOperation::Status, status: Some(TaskStatus::Completed), - ..UpdateTaskModel::default() + worker: None, + error: None, + progress: None, + task_timeout_in_secs: None, }; assert_eq!( diff --git a/scylla_operations/src/update_task.rs b/scylla_operations/src/update_task.rs index e726d8d..2b9f012 100644 --- a/scylla_operations/src/update_task.rs +++ b/scylla_operations/src/update_task.rs @@ -34,9 +34,6 @@ pub fn validate_status_operation(task: &Task, update_task_model: &UpdateTaskMode fn prepare_status_task(mut task: Task, update_task_model: &UpdateTaskModel) -> Task { task.status = update_task_model.status.clone().unwrap(); task.updated = Utc::now(); - if let Some(metrics) = &update_task_model.metrics { - task.metrics = Some(metrics.clone()); - } if let Some(error) = update_task_model.error.clone() { if task.status == TaskStatus::Aborted { task.errors.push(error); diff --git a/scylla_operations/src/update_task/tests.rs b/scylla_operations/src/update_task/tests.rs index a234050..fbb7cdb 100644 --- a/scylla_operations/src/update_task/tests.rs +++ b/scylla_operations/src/update_task/tests.rs @@ -12,7 +12,10 @@ fn validate_status_failure_scenarios() { operation: UpdateOperation::Status, status: None, rn: "abc".to_string(), - ..UpdateTaskModel::default() + error: None, + worker: None, + progress: None, + task_timeout_in_secs: None, }; assert_eq!( @@ -29,7 +32,6 @@ fn validate_status_failure_scenarios() { worker: None, progress: None, task_timeout_in_secs: None, - metrics: None, }; let utm_running_status = UpdateTaskModel { operation: UpdateOperation::Status, @@ -39,7 +41,6 @@ fn validate_status_failure_scenarios() { worker: None, progress: None, task_timeout_in_secs: None, - metrics: None, }; let utm_completed_status = UpdateTaskModel { operation: UpdateOperation::Status, @@ -49,7 +50,6 @@ fn validate_status_failure_scenarios() { worker: None, progress: None, task_timeout_in_secs: None, - metrics: None, }; let t_ready = Task { status: TaskStatus::Ready, @@ -78,7 +78,6 @@ fn validate_status_failure_scenarios() { worker: None, progress: None, task_timeout_in_secs: None, - metrics: None, }; let t_running = Task { status: TaskStatus::Running, @@ -102,7 +101,6 @@ fn validate_status_failure_scenarios() { worker: None, progress: None, task_timeout_in_secs: None, - metrics: None, }; let t_aborted = Task { status: TaskStatus::Aborted, @@ -148,7 +146,6 @@ fn validate_status_failure_scenarios() { worker: None, progress: None, task_timeout_in_secs: None, - metrics: None, }; let t_running = Task { status: TaskStatus::Running, @@ -172,7 +169,6 @@ fn validate_state_success_scenarios() { worker: None, progress: None, task_timeout_in_secs: None, - metrics: None, }; let t_ready = Task { status: TaskStatus::Ready, @@ -191,7 +187,6 @@ fn validate_state_success_scenarios() { worker: None, progress: None, task_timeout_in_secs: None, - metrics: None, }; let utm_completed_status = UpdateTaskModel { operation: UpdateOperation::Status, @@ -201,7 +196,6 @@ fn validate_state_success_scenarios() { worker: None, progress: None, task_timeout_in_secs: None, - metrics: None, }; let utm_aborted_status = UpdateTaskModel { operation: UpdateOperation::Status, @@ -215,7 +209,6 @@ fn validate_state_success_scenarios() { worker: None, progress: None, task_timeout_in_secs: None, - metrics: None, }; let t_running = Task { status: TaskStatus::Running, @@ -245,7 +238,6 @@ fn prepare_status_task_cases() { worker: None, progress: None, task_timeout_in_secs: None, - metrics: None, }; let task = Task { errors: vec![TaskError { @@ -275,7 +267,6 @@ fn prepare_status_task_cases() { worker: None, progress: None, task_timeout_in_secs: None, - metrics: None, }; let task = Task { errors: vec![TaskError { @@ -289,52 +280,6 @@ fn prepare_status_task_cases() { assert_eq!(prepared_task.status, utm_cancelled.status.unwrap()); // error added to list assert_eq!(prepared_task.errors.len(), 1); - - /*********************************/ - // Test metrics functionality when incoming metrics is not None - - let utm_with_metrics = UpdateTaskModel { - operation: UpdateOperation::Status, - status: Some(TaskStatus::Completed), - rn: "abc".to_string(), - error: None, - worker: None, - progress: None, - task_timeout_in_secs: None, - metrics: Some(serde_json::from_str("{\"execution_time\": 150, \"memory_usage\": \"256MB\"}").unwrap()), - }; - let task_with_metrics = Task { - status: TaskStatus::Running, - metrics: Some(serde_json::from_str("{\"start_time\": \"2023-01-01T00:00:00Z\"}").unwrap()), - ..Task::default() - }; - let prepared_task_with_metrics = prepare_status_task(task_with_metrics, &utm_with_metrics); - assert_eq!(prepared_task_with_metrics.status, utm_with_metrics.status.unwrap()); - // metrics should be replaced by the new value - assert_eq!(prepared_task_with_metrics.metrics, utm_with_metrics.metrics); - - /*********************************/ - // Test metrics functionality when incoming metrics is None (should preserve existing metrics) - - let utm_without_metrics = UpdateTaskModel { - operation: UpdateOperation::Status, - status: Some(TaskStatus::Completed), - rn: "abc".to_string(), - error: None, - worker: None, - progress: None, - task_timeout_in_secs: None, - metrics: None, - }; - let task_with_existing_metrics = Task { - status: TaskStatus::Running, - metrics: Some(serde_json::from_str("{\"start_time\": \"2023-01-01T00:00:00Z\"}").unwrap()), - ..Task::default() - }; - let prepared_task_preserve_metrics = prepare_status_task(task_with_existing_metrics.clone(), &utm_without_metrics); - assert_eq!(prepared_task_preserve_metrics.status, utm_without_metrics.status.unwrap()); - // existing metrics should be preserved when incoming metrics is None - assert_eq!(prepared_task_preserve_metrics.metrics, task_with_existing_metrics.metrics); } #[test] @@ -448,7 +393,6 @@ fn validate_heart_beat_operation_cases() { rn: t_ready.rn.clone(), status: None, task_timeout_in_secs: None, - metrics: None, }; let utm_wrong_worker = UpdateTaskModel { operation: HeartBeat, @@ -458,7 +402,6 @@ fn validate_heart_beat_operation_cases() { rn: t_ready.rn.clone(), status: None, task_timeout_in_secs: None, - metrics: None, }; assert_eq!( validate_heart_beat_operation(&t_ready, &utm), @@ -511,7 +454,6 @@ fn prepare_heart_beat_task_cases() { progress: None, worker: None, task_timeout_in_secs: None, - metrics: None, }; let task_2 = Task::default(); let utm_with_progress = UpdateTaskModel { @@ -522,7 +464,6 @@ fn prepare_heart_beat_task_cases() { progress: Some(0.5), worker: None, task_timeout_in_secs: Some(10), - metrics: None, }; let prepared_task = prepare_heart_beat_task(task_1, &utm_without_progress); // just updated @@ -569,7 +510,6 @@ fn validate_lease_operation_cases() { progress: None, worker: Some("worker".to_string()), task_timeout_in_secs: None, - metrics: None, }; let utm_without_worker = UpdateTaskModel { operation: UpdateOperation::Lease, @@ -579,7 +519,6 @@ fn validate_lease_operation_cases() { progress: None, worker: None, task_timeout_in_secs: None, - metrics: None, }; assert_eq!( validate_lease_operation(&t_running, &utm_without_worker), @@ -631,7 +570,6 @@ fn prepare_lease_task_cases() { progress: None, worker: Some("worker".to_string()), task_timeout_in_secs: None, - metrics: None, }; let t = Task { status: TaskStatus::Ready, @@ -812,7 +750,6 @@ fn request_handler_cases() { progress: None, status: None, task_timeout_in_secs: None, - metrics: None, }; let updated_task = request_handler(t, &utm).unwrap(); assert_eq!(updated_task.status, TaskStatus::Running); @@ -833,7 +770,6 @@ fn request_handler_cases() { progress: None, status: None, task_timeout_in_secs: None, - metrics: None, }; let updated_task = request_handler(t, &utm).unwrap(); assert_eq!(updated_task.status, TaskStatus::Ready); @@ -855,7 +791,6 @@ fn request_handler_cases() { progress: None, status: None, task_timeout_in_secs: None, - metrics: None, }; let updated_task = request_handler(t, &utm).unwrap(); assert_eq!(updated_task.status, TaskStatus::Running); @@ -877,7 +812,6 @@ fn request_handler_cases() { progress: Some(0.7), status: None, task_timeout_in_secs: Some(5), - metrics: None, }; let updated_task = request_handler(t, &utm).unwrap(); assert_eq!(updated_task.status, TaskStatus::Running); @@ -898,7 +832,6 @@ fn request_handler_cases() { progress: None, status: Some(TaskStatus::Cancelled), task_timeout_in_secs: None, - metrics: None, }; let updated_task = request_handler(t, &utm).unwrap(); assert_eq!(updated_task.status, TaskStatus::Cancelled); diff --git a/scylla_pg_client/index.ts b/scylla_pg_client/index.ts index 14172c1..8612ad5 100644 --- a/scylla_pg_client/index.ts +++ b/scylla_pg_client/index.ts @@ -115,8 +115,8 @@ class Scylla { return JSON.parse(response); } - public async completeTask(rn: string, metrics?: string): Promise { - let response = await this.scyllaManager.completeTask(rn, metrics); + public async completeTask(rn: string): Promise { + let response = await this.scyllaManager.completeTask(rn); return JSON.parse(response); } diff --git a/scylla_pg_client/package.json b/scylla_pg_client/package.json index b0b9c5a..b32e671 100644 --- a/scylla_pg_client/package.json +++ b/scylla_pg_client/package.json @@ -1,6 +1,6 @@ { "name": "scylla_pg_client", - "version": "0.1.34-dev1", + "version": "0.1.33", "description": "Scylla task scheduler, javascript binding.for postgres", "engines": { "node": ">=14.16.1", @@ -14,7 +14,7 @@ "email": "asharmaanil@gmail.com", "license": "MIT", "dependencies": { - "scylla_pg_js": "0.1.34-dev1" + "scylla_pg_js": "0.1.33" }, "devDependencies": { "@ava/typescript": "^4.1.0", diff --git a/scylla_pg_core/Cargo.toml b/scylla_pg_core/Cargo.toml index 6789e48..9a46a68 100644 --- a/scylla_pg_core/Cargo.toml +++ b/scylla_pg_core/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "scylla_pg_core" -version = "0.1.34-dev1" +version = "0.1.33" edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/scylla_pg_js/Cargo.toml b/scylla_pg_js/Cargo.toml index 2338acb..33aaf8e 100644 --- a/scylla_pg_js/Cargo.toml +++ b/scylla_pg_js/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "scylla_pg_js" -version = "0.1.34-dev1" +version = "0.1.33" edition = "2021" diff --git a/scylla_pg_js/index.d.ts b/scylla_pg_js/index.d.ts index fe14f62..e174f7d 100644 --- a/scylla_pg_js/index.d.ts +++ b/scylla_pg_js/index.d.ts @@ -64,7 +64,7 @@ export class ScyllaManager { * # Errors * Convert rust error into `napi::Error` */ - completeTask(rn: string, metrics?: string | undefined | null): Promise + completeTask(rn: string): Promise /** * # Errors * Convert rust error into `napi::Error` diff --git a/scylla_pg_js/package.json b/scylla_pg_js/package.json index 3e232a3..205f126 100644 --- a/scylla_pg_js/package.json +++ b/scylla_pg_js/package.json @@ -1,6 +1,6 @@ { "name": "scylla_pg_js", - "version": "0.1.34-dev1", + "version": "0.1.33", "main": "index.js", "types": "index.d.ts", "napi": { @@ -38,12 +38,12 @@ }, "packageManager": "yarn@3.3.1", "optionalDependencies": { - "scylla_pg_js-win32-x64-msvc": "0.1.34-dev1", - "scylla_pg_js-darwin-x64": "0.1.34-dev1", - "scylla_pg_js-linux-x64-gnu": "0.1.34-dev1", - "scylla_pg_js-linux-x64-musl": "0.1.34-dev1", - "scylla_pg_js-linux-arm64-musl": "0.1.34-dev1", - "scylla_pg_js-darwin-arm64": "0.1.34-dev1", - "scylla_pg_js-darwin-universal": "0.1.34-dev1" + "scylla_pg_js-win32-x64-msvc": "0.1.33", + "scylla_pg_js-darwin-x64": "0.1.33", + "scylla_pg_js-linux-x64-gnu": "0.1.33", + "scylla_pg_js-linux-x64-musl": "0.1.33", + "scylla_pg_js-linux-arm64-musl": "0.1.33", + "scylla_pg_js-darwin-arm64": "0.1.33", + "scylla_pg_js-darwin-universal": "0.1.33" } } \ No newline at end of file diff --git a/scylla_pg_js/src/lib.rs b/scylla_pg_js/src/lib.rs index 67cfd6c..9670c66 100644 --- a/scylla_pg_js/src/lib.rs +++ b/scylla_pg_js/src/lib.rs @@ -116,8 +116,8 @@ impl ScyllaManager { /// # Errors /// Convert rust error into `napi::Error` #[napi] - pub async fn complete_task(&self, rn: String, metrics: Option) -> napi::Result { - let task_result = self.pg_manager.complete_task(rn, metrics).await; + pub async fn complete_task(&self, rn: String) -> napi::Result { + let task_result = self.pg_manager.complete_task(rn).await; map_lib_response!(task_result) } /// # Errors diff --git a/scylla_pg_lib/Cargo.toml b/scylla_pg_lib/Cargo.toml index a77754d..da95c89 100644 --- a/scylla_pg_lib/Cargo.toml +++ b/scylla_pg_lib/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "scylla_pg_lib" -version = "0.1.34-dev1" +version = "0.1.33" edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/scylla_pg_lib/src/adapter.rs b/scylla_pg_lib/src/adapter.rs index 9227058..447d120 100644 --- a/scylla_pg_lib/src/adapter.rs +++ b/scylla_pg_lib/src/adapter.rs @@ -136,15 +136,17 @@ impl DbExecute for PgAdapter { let mut client: Client = self.pool.get().await?; let stmt = client.prepare_cached(sql).await?; let tx = client.build_transaction().isolation_level(isolation_level).start().await?; - + match tx.execute(&stmt, params).await { - Ok(rows) => match tx.commit().await { - Ok(_) => Ok(rows), - Err(commit_err) => { - log::error!("commit for tx failed: {}", commit_err); - Err(PgAdapterError::DbError(commit_err)) + Ok(rows) => { + match tx.commit().await { + Ok(_) => Ok(rows), + Err(commit_err) => { + log::error!("commit for tx failed: {}", commit_err); + Err(PgAdapterError::DbError(commit_err)) + } } - }, + } Err(e) => { if let Err(rollback_err) = tx.rollback().await { log::error!("rollback for tx failed: {}", rollback_err); diff --git a/scylla_pg_lib/src/bin/load_get_and_lease_task.rs b/scylla_pg_lib/src/bin/load_get_and_lease_task.rs index 436bc3f..c1009cc 100644 --- a/scylla_pg_lib/src/bin/load_get_and_lease_task.rs +++ b/scylla_pg_lib/src/bin/load_get_and_lease_task.rs @@ -43,7 +43,7 @@ pub async fn start_worker(worker_id: String) { // log::error!("error occurred while heartbeat tasks {e}"); // } // tokio::time::sleep(Duration::from_millis(1000)).await; - if let Err(e) = pgm.complete_task(t.rn.clone(), None).await { + if let Err(e) = pgm.complete_task(t.rn.clone()).await { log::error!("error occurred while complete tasks {e}"); } } diff --git a/scylla_pg_lib/src/manager.rs b/scylla_pg_lib/src/manager.rs index c471837..4fdb9b5 100644 --- a/scylla_pg_lib/src/manager.rs +++ b/scylla_pg_lib/src/manager.rs @@ -51,7 +51,6 @@ impl PgManager { operation: UpdateOperation::Lease, error: None, task_timeout_in_secs, - metrics: None, }; self.update_task(&update_task_model).await } @@ -66,7 +65,6 @@ impl PgManager { operation: UpdateOperation::HeartBeat, error: None, task_timeout_in_secs, - metrics: None, }; self.update_task(&update_task_model).await } @@ -81,13 +79,12 @@ impl PgManager { operation: UpdateOperation::Status, error: None, task_timeout_in_secs: None, - metrics: None, }; self.update_task(&update_task_model).await } /// # Errors /// Returns `PgAdapterError` - pub async fn complete_task(&self, rn: String, metrics: Option) -> Result { + pub async fn complete_task(&self, rn: String) -> Result { let update_task_model = UpdateTaskModel { rn, worker: None, @@ -96,11 +93,6 @@ impl PgManager { operation: UpdateOperation::Status, error: None, task_timeout_in_secs: None, - metrics: if let Some(metrics_str) = metrics { - serde_json::from_str(&metrics_str).ok() // set to None if deserialization fails - } else { - None - }, }; self.update_task(&update_task_model).await } @@ -115,7 +107,6 @@ impl PgManager { operation: UpdateOperation::Status, error: Some(error), task_timeout_in_secs: None, - metrics: None, }; self.update_task(&update_task_model).await } @@ -135,7 +126,6 @@ impl PgManager { operation: UpdateOperation::Yield, error: None, task_timeout_in_secs: None, - metrics: None, }; self.update_task(&update_task_model).await } @@ -150,7 +140,6 @@ impl PgManager { operation: UpdateOperation::Reset, error: None, task_timeout_in_secs: None, - metrics: None, }; self.update_task(&update_task_model).await } diff --git a/scylla_pg_lib/src/manager/tests.rs b/scylla_pg_lib/src/manager/tests.rs index 2fd88bd..addd996 100644 --- a/scylla_pg_lib/src/manager/tests.rs +++ b/scylla_pg_lib/src/manager/tests.rs @@ -171,7 +171,7 @@ async fn pg_manager_mock_adapter() { pgm.heartbeat_task("2".to_string(), "worker".to_string(), None, Some(5)).await.unwrap().rn, "update".to_string() ); - assert_eq!(pgm.complete_task("2".to_string(), None).await.unwrap().rn, "update".to_string()); + assert_eq!(pgm.complete_task("2".to_string()).await.unwrap().rn, "update".to_string()); assert_eq!( pgm.abort_task( "2".to_string(), diff --git a/scylla_pg_lib/tests/get_tasks.rs b/scylla_pg_lib/tests/get_tasks.rs index fa9dc8a..5d72b28 100644 --- a/scylla_pg_lib/tests/get_tasks.rs +++ b/scylla_pg_lib/tests/get_tasks.rs @@ -76,7 +76,7 @@ async fn get_completed_tasks() { }; pgm.insert_task(atm).await.unwrap(); pgm.lease_task("add_test_1".to_string(), "worker".to_string(), None).await.unwrap(); - pgm.complete_task("add_test_1".to_string(), None).await.unwrap(); + pgm.complete_task("add_test_1".to_string()).await.unwrap(); let gtm = GetTaskModel { status: Some(TaskStatus::Completed), diff --git a/scylla_pg_lib/tests/reset_tasks.rs b/scylla_pg_lib/tests/reset_tasks.rs index 4571625..f66f718 100644 --- a/scylla_pg_lib/tests/reset_tasks.rs +++ b/scylla_pg_lib/tests/reset_tasks.rs @@ -56,7 +56,7 @@ async fn reset_batch_tasks() { assert_eq!(reset_tasks[0].history.iter().position(|t| t.typ == TaskHistoryType::Assignment), Some(0)); assert_eq!(reset_tasks[1].history.iter().position(|t| t.typ == TaskHistoryType::Timeout), Some(1)); assert_eq!(reset_tasks[1].history.iter().position(|t| t.typ == TaskHistoryType::Assignment), Some(0)); - + // truncate table after use common::truncate_table().await; } diff --git a/scylla_pg_monitor/Cargo.toml b/scylla_pg_monitor/Cargo.toml index c46267f..3dfd8c5 100644 --- a/scylla_pg_monitor/Cargo.toml +++ b/scylla_pg_monitor/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "scylla_pg_monitor" -version = "0.1.34-dev1" +version = "0.1.33" edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html