From eb82eaa9631e78f50781f842fbf3df008641894c Mon Sep 17 00:00:00 2001 From: Kyle Altendorf Date: Mon, 28 Jun 2021 22:42:56 -0400 Subject: [PATCH] some references are still k32 --- src/plotman/_tests/plot_util_test.py | 4 ++-- src/plotman/archive.py | 4 ++-- src/plotman/plot_util.py | 2 +- src/plotman/reporting.py | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/plotman/_tests/plot_util_test.py b/src/plotman/_tests/plot_util_test.py index 5a0f9879..ab912e55 100755 --- a/src/plotman/_tests/plot_util_test.py +++ b/src/plotman/_tests/plot_util_test.py @@ -45,7 +45,7 @@ def test_columns() -> None: [ 1 ], [ 2 ] ] ) -def test_list_k_plots(fs: pyfakefs.fake_filesystem.FakeFilesystem) -> None: +def test_list_plots(fs: pyfakefs.fake_filesystem.FakeFilesystem) -> None: fs.create_file('/t/plot-k32-0.plot', st_size=108 * GB) fs.create_file('/t/plot-k32-1.plot', st_size=108 * GB) fs.create_file('/t/.plot-k32-2.plot', st_size=108 * GB) @@ -53,7 +53,7 @@ def test_list_k_plots(fs: pyfakefs.fake_filesystem.FakeFilesystem) -> None: fs.create_file('/t/plot-k32-4.plot', st_size=100 * GB) fs.create_file('/t/plot-k32-5.plot', st_size=108 * GB) - assert (plot_util.list_k_plots('/t/') == + assert (plot_util.list_plots('/t/') == [ '/t/plot-k32-0.plot', '/t/plot-k32-1.plot', '/t/plot-k32-5.plot' ] ) diff --git a/src/plotman/archive.py b/src/plotman/archive.py index 0c78ee07..59a9a9e6 100644 --- a/src/plotman/archive.py +++ b/src/plotman/archive.py @@ -96,7 +96,7 @@ def spawn_archive_process(dir_cfg: configuration.Directories, arch_cfg: configur def compute_priority(phase: job.Phase, gb_free: float, n_plots: int) -> int: # All these values are designed around dst buffer dirs of about - # ~2TB size and containing k plots. TODO: Generalize, and + # ~2TB size and containing k32 plots. TODO: Generalize, and # rewrite as a sort function. priority = 50 @@ -210,7 +210,7 @@ def archive(dir_cfg: configuration.Directories, arch_cfg: configuration.Archivin dst_dir = dir_cfg.get_dst_directories() for d in dst_dir: ph = dir2ph.get(d, job.Phase(0, 0)) - dir_plots = plot_util.list_k_plots(d) + dir_plots = plot_util.list_plots(d) gb_free = plot_util.df_b(d) / plot_util.GB n_plots = len(dir_plots) priority = compute_priority(ph, gb_free, n_plots) diff --git a/src/plotman/plot_util.py b/src/plotman/plot_util.py index 5bad17bd..38d5f78c 100644 --- a/src/plotman/plot_util.py +++ b/src/plotman/plot_util.py @@ -51,7 +51,7 @@ def split_path_prefix(items: typing.List[str]) -> typing.Tuple[str, typing.List[ remainders = [ os.path.relpath(i, prefix) for i in items ] return (prefix, remainders) -def list_k_plots(d: str) -> typing.List[str]: +def list_plots(d: str) -> typing.List[str]: 'List completed plots in a directory (not recursive)' plots = [] for plot in os.listdir(d): diff --git a/src/plotman/reporting.py b/src/plotman/reporting.py index 83fe5230..75ad5a8c 100644 --- a/src/plotman/reporting.py +++ b/src/plotman/reporting.py @@ -216,7 +216,7 @@ def dst_dir_report(jobs: typing.List[job.Job], dstdirs: typing.List[str], width: eldest_ph = dir2oldphase.get(d, job.Phase(0, 0)) phases = job.job_phases_for_dstdir(d, jobs) - dir_plots = plot_util.list_k_plots(d) + dir_plots = plot_util.list_plots(d) gb_free = int(plot_util.df_b(d) / plot_util.GB) n_plots = len(dir_plots) priority = archive.compute_priority(eldest_ph, gb_free, n_plots)