From 19454a42149277a47790a693b78de4c0b3f3e134 Mon Sep 17 00:00:00 2001 From: David Kyle Date: Mon, 10 Mar 2025 21:30:47 +0000 Subject: [PATCH 1/3] Avoid unnecessary calls to Task#getDescription --- .../packageloader/action/TransportLoadTrainedModelPackage.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x-pack/plugin/ml-package-loader/src/main/java/org/elasticsearch/xpack/ml/packageloader/action/TransportLoadTrainedModelPackage.java b/x-pack/plugin/ml-package-loader/src/main/java/org/elasticsearch/xpack/ml/packageloader/action/TransportLoadTrainedModelPackage.java index ead85ffab0b64..1ef56ac4fc84e 100644 --- a/x-pack/plugin/ml-package-loader/src/main/java/org/elasticsearch/xpack/ml/packageloader/action/TransportLoadTrainedModelPackage.java +++ b/x-pack/plugin/ml-package-loader/src/main/java/org/elasticsearch/xpack/ml/packageloader/action/TransportLoadTrainedModelPackage.java @@ -151,7 +151,7 @@ synchronized boolean handleDownloadInProgress( ModelDownloadTask inProgress = null; for (var task : tasks) { - if (description.equals(task.getDescription()) && task instanceof ModelDownloadTask downloadTask) { + if (task instanceof ModelDownloadTask downloadTask && (description.equals(task.getDescription()))) { inProgress = downloadTask; break; } From 24e49fd7c2fec58f200ab40dbe8202358dee6492 Mon Sep 17 00:00:00 2001 From: David Kyle Date: Mon, 10 Mar 2025 21:37:54 +0000 Subject: [PATCH 2/3] Update docs/changelog/124527.yaml --- docs/changelog/124527.yaml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 docs/changelog/124527.yaml diff --git a/docs/changelog/124527.yaml b/docs/changelog/124527.yaml new file mode 100644 index 0000000000000..ecd7fd20c800e --- /dev/null +++ b/docs/changelog/124527.yaml @@ -0,0 +1,5 @@ +pr: 124527 +summary: Avoid unnecessary calls to Task#getDescription in model download +area: Machine Learning +type: bug +issues: [] From eb91953d995d66bd6efcea56b0ef4a407551cafb Mon Sep 17 00:00:00 2001 From: David Kyle Date: Mon, 10 Mar 2025 21:41:40 +0000 Subject: [PATCH 3/3] nits --- docs/changelog/124527.yaml | 2 +- .../packageloader/action/TransportLoadTrainedModelPackage.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/changelog/124527.yaml b/docs/changelog/124527.yaml index ecd7fd20c800e..5606683cca95a 100644 --- a/docs/changelog/124527.yaml +++ b/docs/changelog/124527.yaml @@ -1,5 +1,5 @@ pr: 124527 -summary: Avoid unnecessary calls to Task#getDescription in model download +summary: Avoid potentially throwing calls to Task#getDescription in model download area: Machine Learning type: bug issues: [] diff --git a/x-pack/plugin/ml-package-loader/src/main/java/org/elasticsearch/xpack/ml/packageloader/action/TransportLoadTrainedModelPackage.java b/x-pack/plugin/ml-package-loader/src/main/java/org/elasticsearch/xpack/ml/packageloader/action/TransportLoadTrainedModelPackage.java index 1ef56ac4fc84e..7727d56a62330 100644 --- a/x-pack/plugin/ml-package-loader/src/main/java/org/elasticsearch/xpack/ml/packageloader/action/TransportLoadTrainedModelPackage.java +++ b/x-pack/plugin/ml-package-loader/src/main/java/org/elasticsearch/xpack/ml/packageloader/action/TransportLoadTrainedModelPackage.java @@ -151,7 +151,7 @@ synchronized boolean handleDownloadInProgress( ModelDownloadTask inProgress = null; for (var task : tasks) { - if (task instanceof ModelDownloadTask downloadTask && (description.equals(task.getDescription()))) { + if (task instanceof ModelDownloadTask downloadTask && (description.equals(downloadTask.getDescription()))) { inProgress = downloadTask; break; }