Append first 8 characters of UUIDv4 hex to avoid collisionmaster
@@ -49,8 +49,9 @@ do | |||||
if [[ $cur_size -gt $BYTES_PER_CHUNK ]] | if [[ $cur_size -gt $BYTES_PER_CHUNK ]] | ||||
then | then | ||||
timestamp=$( date +'%Y%m%d%H%M%S' ) | timestamp=$( date +'%Y%m%d%H%M%S' ) | ||||
echo "Current archive is full, moving to ${timestamp}." | |||||
mv "$CHUNKER_WORKING_DIR/current" "$PACKING_QUEUE_DIR/${timestamp}" | |||||
uuid=$(cat /proc/sys/kernel/random/uuid | cut -d- -f1) | |||||
echo "Current archive is full, moving to ${timestamp}_${uuid}." | |||||
mv "$CHUNKER_WORKING_DIR/current" "$PACKING_QUEUE_DIR/${timestamp}_${uuid}" | |||||
cur_size=0 | cur_size=0 | ||||
sleep 3 | sleep 3 | ||||
fi | fi | ||||
@@ -55,8 +55,8 @@ mayicontinue | |||||
ITEM=none | ITEM=none | ||||
while [[ $ITEM = none ]] | while [[ $ITEM = none ]] | ||||
do | do | ||||
possible_item=$( ls -1 "$PACKING_QUEUE_DIR/" | grep 201 | sort | head -n 1 ) | |||||
if [[ $possible_item =~ 201 ]] | |||||
possible_item=$( ls -1 "$PACKING_QUEUE_DIR/" | grep -E '[0-9]{14}_[a-f0-9]{8}$' | sort | head -n 1 ) | |||||
if test -n "${possible_item}" | |||||
then | then | ||||
echo "Trying to grab $possible_item" | echo "Trying to grab $possible_item" | ||||
if mv "$PACKING_QUEUE_DIR/$possible_item" "$PACKER_WORKING_CHUNKS_DIR/" | if mv "$PACKING_QUEUE_DIR/$possible_item" "$PACKER_WORKING_CHUNKS_DIR/" | ||||
@@ -40,8 +40,8 @@ mayicontinue | |||||
ITEM=none | ITEM=none | ||||
while [[ $ITEM = none ]] | while [[ $ITEM = none ]] | ||||
do | do | ||||
possible_item=$( ls -1 "$UPLOAD_QUEUE_DIR" | grep 201 | sort | head -n 1 ) | |||||
if [[ $possible_item =~ 201 ]] | |||||
possible_item=$( ls -1 "$UPLOAD_QUEUE_DIR" | grep -E '[0-9]{14}_[a-f0-9]{8}$' | sort | head -n 1 ) | |||||
if test -n "${possible_item}" | |||||
then | then | ||||
echo "Trying to grab $possible_item" | echo "Trying to grab $possible_item" | ||||
if mv "$UPLOAD_QUEUE_DIR/$possible_item" "$UPLOADER_WORKING_DIR/" | if mv "$UPLOAD_QUEUE_DIR/$possible_item" "$UPLOADER_WORKING_DIR/" | ||||