Merge branch 'devel'

Author: jerome-quere

lib/storage.sh

@@ -34,6 +34,7 @@ function ib_storage_run () {
     local storageName="$1"
     local taskName="$2"
     local itemName="$3"
+    local itemTag="$4"
 
     for storage in $IB_STORAGES
     do
@@ -42,13 +43,13 @@ function ib_storage_run () {
 	    local storageType=$(ib_get_conf_value "IB_STORAGE_${storageName}_TYPE")
 	    case "$storageType" in
 		swift)
-		    ib_storage_swift_run "$storageName" "$taskName" "$itemName" || return -1
+		    ib_storage_swift_run "$storageName" "$taskName" "$itemName" "$itemTag" || return -1
 		    ;;
 		fs)
-		    ib_storage_fs_run "$storageName" "$taskName" "$itemName" || return -1
+		    ib_storage_fs_run "$storageName" "$taskName" "$itemName" "$itemTag" || return -1
 		    ;;
 		ssh)
-		    ib_storage_ssh_run "$storageName" "$taskName" "$itemName" || return -1
+		    ib_storage_ssh_run "$storageName" "$taskName" "$itemName" "$itemTag" || return -1
 		    ;;
 		*)
 		    echo "Unknow storage type [$storageType]"

lib/storages/fs.sh

@@ -35,6 +35,7 @@ function ib_storage_fs_run() {
     local storageName="$1"
     local taskName="$2"
     local itemName="$3"
+    local itemTag="$4"
     local fsBasePath=$(ib_get_conf_value "IB_STORAGE_${storageName}_BASEPATH")
 
     if [ -z "$fsBasePath" ]
@@ -43,7 +44,13 @@ function ib_storage_fs_run() {
 	return -1
     fi
 
-    local fileName="${fsBasePath}/${taskName}/${DATE}/${itemName}"
+    local folderName="${DATE}"
+    if [ ! -z "$itemTag" ]
+    then
+	folderName="${folderName}-${itemTag}"
+    fi
+
+    local fileName="${fsBasePath}/${taskName}/${folderName}/${itemName}"
     mkdir -p $(dirname "$fileName")
     cat > "${fileName}"
 }

lib/storages/ssh.sh

@@ -35,6 +35,7 @@ function ib_storage_ssh_run() {
     local storageName="$1"
     local taskName="$2"
     local itemName="$3"
+    local itemTag="$4"
     local sshUser=$(ib_get_conf_value "IB_STORAGE_${storageName}_USER")
     local sshHost=$(ib_get_conf_value "IB_STORAGE_${storageName}_HOST")
     local sshPort=$(ib_get_conf_value "IB_STORAGE_${storageName}_PORT")
@@ -58,7 +59,13 @@ function ib_storage_ssh_run() {
 	sshKey="-i ${sshKey}"
     fi
 
-    local fileName="${sshBasePath}/${taskName}/${DATE}/${itemName}"
+    local folderName="${DATE}"
+    if [ ! -z "$itemTag" ]
+    then
+	folderName="${folderName}-${itemTag}"
+    fi
+
+    local fileName="${sshBasePath}/${taskName}/${folderName}/${itemName}"
     ssh "${sshUser}@${sshHost}" $sshKey -p "${sshPort}" \
 	"mkdir -p \"\$(dirname '${fileName}')\" ; cat > '${fileName}'"
 }

lib/storages/swift.sh

@@ -35,6 +35,7 @@ function ib_storage_swift_run () {
     local storageName="$1"
     local taskName="$2"
     local itemName="$3"
+    local itemTag="$4"
     local swiftAuthUrl=$(ib_get_conf_value "IB_STORAGE_${storageName}_AUTHURL")
     local swiftUser=$(ib_get_conf_value "IB_STORAGE_${storageName}_USER")
     local swiftPassword=$(ib_get_conf_value "IB_STORAGE_${storageName}_PASSWORD")
@@ -53,6 +54,12 @@ function ib_storage_swift_run () {
 	swiftSplitSize="2G"
     fi
 
+    local folderName="${DATE}"
+    if [ ! -z "$itemTag" ]
+    then
+	folderName="${folderName}-${itemTag}"
+    fi
+
     stdin2swift -a "$swiftAuthUrl" -u "$swiftUser" -p "$swiftPassword" -s "$swiftSplitSize" \
-		"$swiftContainer" "${swiftBasePath}/${taskName}/${DATE}/${itemName}"
+		"$swiftContainer" "${swiftBasePath}/${taskName}/${folderName}/${itemName}"
 }

lib/tasks/tarball-incremental.sh

@@ -36,6 +36,7 @@ function ib_task_tarball-incremental_run() {
     local storageName=$(ib_get_conf_value "IB_TASK_${taskName}_STORAGE")
     local masterFrequency=$(ib_get_conf_value "IB_TASK_data2_MASTER_FREQUENCY")
     local masterFrequencyValue=$(ib_get_conf_value "IB_TASK_data2_MASTER_FREQUENCY_VALUE")
+    local masterTag=""
 
     if [ -z "$storageName" ]; then echo "No valid IB_TASK_${taskName}_STORAGE found"; return -1; fi
     if [ -z "$listFile" ]; then echo "No valid IB_TASK_${taskName}_LIST_FILE found"; return -1; fi
@@ -57,13 +58,13 @@ function ib_task_tarball-incremental_run() {
 	masterFrequencyValue=1
     fi
 
-    echo $masterFrequency $masterFrequencyValue
     if [[ (( "$masterFrequency" == "weekly" ) && ( $(date "+%u") -eq "$masterFrequencyValue" )) || \
 	      (( "$masterFrequency" == "monthly" ) && ( $(date "+%d") -eq "$masterFrequencyValue" )) ]]
     then
 	rm -f "$listFile"
+        masterTag="master"
     fi
 
     tar --create -z --listed-incremental=$listFile $folders \
-	| ib_storage_run $storageName $taskName "${fileBaseName}-${DATE}.tar.gz"
+	| ib_storage_run $storageName $taskName "${fileBaseName}-${DATE}.tar.gz" "${masterTag}"
 }