Merge pull request #58 from podaac/release/0.6.1

Release/0.6.1
podaac · Mar 3, 2023 · 66968eb · 66968eb
2 parents 84ab18f + 30b8148
commit 66968eb
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -13,6 +13,17 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Fixed
 
 
+## [0.6.1]
+
+### Added
+### Changed 
+  - PODAAC-5065
+    - Update when to sleep when not enough shared memory
+### Deprecated 
+### Removed
+### Fixed
+
+
 ## [0.6.0]
 
 ### Added

diff --git a/cmr/ops_associations.txt b/cmr/ops_associations.txt
@@ -16,3 +16,12 @@ C2158348264-POCLOUD
 C2158350299-POCLOUD
 C2152045877-POCLOUD
 C1996881636-POCLOUD
+C2251465126-POCLOUD
+C2075141524-POCLOUD
+C1940471193-POCLOUD
+C2251464384-POCLOUD
+C1940472420-POCLOUD
+C1940470304-POCLOUD
+C2205121449-POCLOUD
+C2596983413-POCLOUD
+C2596986276-POCLOUD
diff --git a/cmr/uat_associations.txt b/cmr/uat_associations.txt
@@ -15,3 +15,4 @@ C1242387586-POCLOUD
 C1242387602-POCLOUD
 C1242387624-POCLOUD
 C1238658389-POCLOUD
+C1256420925-POCLOUD
diff --git a/jupyter_notebooks/harmony_concise_api_test.ipynb b/jupyter_notebooks/harmony_concise_api_test.ipynb
@@ -234,10 +234,18 @@
     "else:\n",
     "    group = group[0]\n",
     "    \n",
+    "drop_variables = [\n",
+    "    'time',\n",
+    "    'sample',\n",
+    "    'meas_ind',\n",
+    "    'wvf_ind',\n",
+    "    'ddm'\n",
+    "]\n",
+    "    \n",
     "try:\n",
     "    ds = xr.open_dataset(filename, group=group, decode_times=False)\n",
     "except xr.core.variable.MissingDimensionsError:\n",
-    "    ds = xr.open_dataset(filename, group=group, decode_times=False, drop_variables=['time','sample'])\n",
+    "    ds = xr.open_dataset(filename, group=group, decode_times=False, drop_variables=drop_variables)\n",
     "\n",
     "print(list(ds.variables))\n",
     "    \n",
@@ -273,13 +281,17 @@
     "    x = \"longitude\"\n",
     "elif \"beam_clon\" in variables:\n",
     "    x = \"beam_clon\"\n",
+    "elif \"sp_lon\" in variables:\n",
+    "    x = \"sp_lon\"\n",
     "    \n",
     "if \"lat\" in variables:\n",
     "    y = \"lon\"\n",
     "elif \"latitude\" in variables:\n",
     "    y = \"longitude\"\n",
-    "elif \"beam_clat\":\n",
+    "elif \"beam_clat\" in variables:\n",
     "    y = \"beam_clat\"\n",
+    "elif \"sp_lat\" in variables:\n",
+    "    y = \"sp_lat\"\n",
     "    \n",
     "for index in range(0, max_results):\n",
     "        \n",

diff --git a/podaac/merger/merge_worker.py b/podaac/merger/merge_worker.py
@@ -252,7 +252,7 @@ def _run_worker(in_queue, out_queue, max_dims, var_info, memory_limit, lock):
                     raise RuntimeError(f'Merging failed - MAX MEMORY REACHED: {resized_arr.nbytes}')
 
                 # Limit to how much memory we allocate to max memory size
-                while memory_limit.value + resized_arr.nbytes > max_memory_size and not out_queue.empty():
+                while (memory_limit.value + resized_arr.nbytes) > max_memory_size > resized_arr.nbytes:
                     time.sleep(.5)
 
                 # Copy resized array to shared memory

diff --git a/pyproject.toml b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "podaac-concise"
-version = "0.6.0"
+version = "0.6.1-rc.1"
 description = "Harmony service that merges granules"
 authors = ["podaac-tva <[email protected]>"]
 license = "Apache-2.0"