Skip to content

Commit fa20056

Browse files
authored
*: replace expr commond to bc #725 (#729)
1 parent 8b3969c commit fa20056

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

Dockerfile.sidecar

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ RUN set -ex; \
4343
ARG XTRABACKUP_PKG=percona-xtrabackup-24
4444
RUN set -ex; \
4545
apt-get update; \
46-
apt-get install -y --no-install-recommends gnupg2 wget lsb-release curl; \
46+
apt-get install -y --no-install-recommends gnupg2 wget lsb-release curl bc; \
4747
wget -P /tmp --no-check-certificate https://repo.percona.com/apt/percona-release_latest.$(lsb_release -sc)_all.deb; \
4848
dpkg -i /tmp/percona-release_latest.$(lsb_release -sc)_all.deb; \
4949
apt-get update; \

backup/syncer/job.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ func (s *jobSyncer) ensurePodSpec(in corev1.PodSpec) corev1.PodSpec {
160160
s.backup.Namespace, s.backup.GetNameForJob(), backupToDir, DateTime)
161161
// Add the check DiskUsage
162162
// use expr because shell cannot compare float number
163-
checkUsage := `[ $(expr $(df /backup|awk 'NR>1 {print $4}') \> $(du /backup |awk 'END {if (NR > 1) {print $1 /(NR-1)} else print 0}')) -eq '1' ] || { echo disk available may be too small; exit 1;};`
163+
checkUsage := `[ $(echo "$(df /backup|awk 'NR>1 {print $4}') > $(du /backup |awk 'END {if (NR > 1) {print $1 /(NR-1)} else print 0}')"|bc) -eq '1' ] || { echo disk available may be too small; exit 1;};`
164164
in.Containers[0].Args = []string{
165165
checkUsage + fmt.Sprintf("mkdir -p /backup/%s;"+
166166
"curl --user $BACKUP_USER:$BACKUP_PASSWORD %s/download|xbstream -x -C /backup/%s; err1=${PIPESTATUS[0]};"+

0 commit comments

Comments
 (0)