Skip to content

adding Mountpoint option to S3 index #450

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kh4rdur wants to merge 3 commits into
base: master
Choose a base branch
from
Open

adding Mountpoint option to S3 index #450

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
02de873
adding Mountpoint option to S3 index
kh4rdur Jul 11, 2025
4a44730
Update on Removing the files
kh4rdur Jul 11, 2025
cb697cc
Update s3index.py
kh4rdur Jul 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 16 additions & 3 deletions src/utils/s3index.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ def all_indexed_names(ursa: UrsaDb) -> Set[str]:
def process_and_delete_batch(
ursa: UrsaDb,
batch: List[str],
workdir_batch: List[str],
compact_threshold: int,
types: List[str],
tags: List[str],
Expand All @@ -47,7 +48,7 @@ def process_and_delete_batch(
)
if "error" in result:
logging.error("Batch %s errored: %s", result["error"])
for bfile in batch:
for bfile in workdir_batch:
os.unlink(bfile)


Expand Down Expand Up @@ -95,6 +96,11 @@ def main() -> None:
type=int,
default=40,
)
parser.add_argument(
"--docker-mountpoint",
help="mountpoint for samples within ursadb/Mquery docker",
default=None,
)

args = parser.parse_args()
types = list(set(args.types))
Expand Down Expand Up @@ -134,6 +140,7 @@ def main() -> None:
workdir.mkdir()

batch = []
workdir_batch = []
for s3_obj in client.list_objects(args.s3_bucket):
if s3_obj.object_name in fileset:
continue
Expand All @@ -143,20 +150,26 @@ def main() -> None:
next_path = workdir / s3_obj.object_name
with open(next_path, "wb") as f_out:
shutil.copyfileobj(f_in, f_out)

if args.docker_mountpoint != None:
next_path = f"{args.docker_mountpoint}/{s3_obj.object_name}"
workdir_batch.append(str(workdir / s3_obj.object_name))
batch.append(str(next_path))

finally:
f_in.close()
f_in.release_conn()

if len(batch) == args.batch:
process_and_delete_batch(
ursa, batch, compact_threshold, types, args.tags
ursa, batch, workdir_batch, compact_threshold, types, args.tags
)
batch = []
workdir_batch = []

if len(batch):
process_and_delete_batch(
ursa, batch, compact_threshold, types, args.tags
ursa, batch, workdir_batch, compact_threshold, types, args.tags
)

if list(workdir.iterdir()):
Expand Down