diff --git a/report.txt b/report.txt index f0185ec..92084f3 100644 --- a/report.txt +++ b/report.txt @@ -126,3 +126,14 @@ Nombre de coupures: 0 Quantite dans la table: 22 Debut: 2024/08/16 - 16:25:31 Fin: 2024/08/16 - 16:28:13 +==================== +Résumé du transfert +==================== +Commande de tranfert: rsync +Temps de transfert m: 0 +Temps de transfert s: 12.71 +Vitesse de transfert: 252.23 MB/s +Nombre de coupures: 4 +Quantite dans la table: 14 +Debut: 2024/08/19 - 16:47:36 +Fin: 2024/08/19 - 16:50:23 diff --git a/transfert.sh b/transfert.sh index daf9040..21be56f 100755 --- a/transfert.sh +++ b/transfert.sh @@ -9,8 +9,11 @@ REMOVE_REMOTE="rm $DESTINATION_PATH$FILE_TO_TRANSFER" LOGFILE="transfer_log.txt" DATE=$(date +"%Y%m%d") STIME=$(date +"%Y/%m/%d - %H:%M:%S") +USED_RAM=$(free -m | grep Mem | awk '{print $3}') +PID_CHECKRAM=0; i=1 + # Fonction pour démarrer le transfert start_transfer() { case $TRANSFER_METHOD in @@ -48,20 +51,36 @@ check_table(){ echo "" else echo "|| CREATE TABLE $TRANSFER_METHOD ||" - su postgres -c "psql d$DATE -c \"CREATE TABLE $TRANSFER_METHOD (id SERIAL, tmp BIGINT, speed NUMERIC, cut INT);\"" + su postgres -c "psql d$DATE -c \"CREATE TABLE $TRANSFER_METHOD (id SERIAL, tmp BIGINT, speed NUMERIC, ram BIGINT, cut INT);\"" fi } insert_db(){ - su postgres -c "psql d$DATE -c \"INSERT INTO $TRANSFER_METHOD (id, tmp, speed, cut) VALUES (DEFAULT, $TOTAL_SECONDS, $TRANSFER_SPEED, $ERRORS);\"" + su postgres -c "psql d$DATE -c \"INSERT INTO $TRANSFER_METHOD (id, tmp, speed, ram, cut) VALUES (DEFAULT, $TOTAL_SECONDS, $TRANSFER_SPEED, $USED_RAM, $ERRORS);\"" } make_dbtot(){ - su postgres -c "psql d$DATE -c \"CREATE TABLE total$TRANSFER_METHOD AS SELECT ROUND(AVG(tmp), 2) AS tmp , ROUND(AVG(speed), 2) AS speed, SUM(cut) AS cut FROM $TRANSFER_METHOD;\"" + su postgres -c "psql d$DATE -c \"CREATE TABLE total$TRANSFER_METHOD AS SELECT ROUND(AVG(tmp), 2) AS tmp , ROUND(AVG(speed), 2) AS speed, ROUND(AVG(ram), 2) AS ram, SUM(cut) AS cut FROM $TRANSFER_METHOD;\"" } +check_ram(){ + while true; do + PID_CHECKRAM=$(pgrep $TRANSFER_METHOD) + if [ -n "$PID_CHECKRAM" ];then + echo "CHECK RAM INIT" + USED_RAM=$(free -m | grep Mem | awk '{print $3}') + LAST_PID=$! + #kill -9 $LAST_PID + echo "CHECK RAM INIT" + echo "PID RAM: $PID_CHECKRAM" + sleep 5 + fi + done +} + + # Tu fait le check-up check_db @@ -69,9 +88,13 @@ check_table for i in $(seq 1 10); do - + # Démarrer le transfert et mesurer le temps - start_transfer + check_ram & + + start_transfer + + #kill -9 $PID_CHECKRAM # Analyser les données # Extraire les minutes et les secondes