Skip to content
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

UTAPI-109: Use UUID in v1 reindex keys #1308

Merged
merged 4 commits into from
Oct 15, 2024
Merged

UTAPI-109: Use UUID in v1 reindex keys #1308

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3d08d9d
bugfix(UTAPI-109): Append uuidv4 to sorted set members during reindex
tmacro Oct 9, 2024
268c8b5
bugfix(UTAPI-109): Remove unused imports
tmacro Oct 9, 2024
9ccb24d
bugfix(UTAPI-109): Remove undefined variable reference
tmacro Oct 9, 2024
285f6ca
bugfix(UTAPI-109): Round reindex timestamp correctly to 15 minute int…
tmacro Oct 14, 2024
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
22 changes: 15 additions & 7 deletions lib/reindex/s3_bucketd.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,18 @@
import itertools
import json
import logging
import os
import re
import sys
import time
import urllib
from collections import defaultdict, namedtuple
import uuid
from collections import namedtuple
from concurrent.futures import ThreadPoolExecutor
from datetime import datetime

import redis
import requests
from requests import ConnectionError, HTTPError, Timeout
from requests import ConnectionError, Timeout

logging.basicConfig(level=logging.INFO)
_log = logging.getLogger('utapi-reindex')
Expand Down Expand Up @@ -258,7 +259,7 @@ def _sum_objects(self, bucket, listing, only_latest_when_locked = False):
total_size += size

except InvalidListing:
_log.error('Invalid contents in listing. bucket:%s status_code:%s'%(bucket.name, status_code))
_log.error('Invalid contents in listing. bucket:%s'%(bucket.name))
raise InvalidListing(bucket.name)
return count, total_size

Expand Down Expand Up @@ -384,14 +385,21 @@ def get_redis_client(options):
)

def update_redis(client, resource, name, obj_count, total_size):
timestamp = int(time.time() - 15 * 60) * 1000
now = datetime.utcnow()
# Round down to the nearest 15 minute interval
rounded_minute = now.minute - (now.minute % 15)
now = now.replace(minute=rounded_minute, second=0, microsecond=0)
# Convert to milliseconds
timestamp = int(now.timestamp()) * 1000
obj_count_key = 's3:%s:%s:numberOfObjects' % (resource, name)
total_size_key = 's3:%s:%s:storageUtilized' % (resource, name)
obj_count_serialized = f"{obj_count}:{uuid.uuid4()}"
total_size_serialized = f"{total_size}:{uuid.uuid4()}"

client.zremrangebyscore(obj_count_key, timestamp, timestamp)
client.zremrangebyscore(total_size_key, timestamp, timestamp)
client.zadd(obj_count_key, {obj_count: timestamp})
client.zadd(total_size_key, {total_size: timestamp})
client.zadd(obj_count_key, {obj_count_serialized: timestamp})
client.zadd(total_size_key, {total_size_serialized: timestamp})
client.set(obj_count_key + ':counter', obj_count)
client.set(total_size_key + ':counter', total_size)

Expand Down
Loading