From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <okoshovetc@tarantool.org>
Received: from smtp42.i.mail.ru (smtp42.i.mail.ru [94.100.177.102])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by dev.tarantool.org (Postfix) with ESMTPS id 991EA469710
 for <tarantool-patches@dev.tarantool.org>;
 Wed, 25 Nov 2020 18:00:36 +0300 (MSK)
From: Oleg Koshovetc <okoshovetc@tarantool.org>
Message-ID: <d72be147-9a5c-dac9-85c6-f56a459d2bad@tarantool.org>
Date: Wed, 25 Nov 2020 17:59:57 +0300
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"; format="flowed"
Content-Transfer-Encoding: 8bit
Content-Language: en-US
Subject: [Tarantool-patches] [PATCH] durability: direct tpcc_load usage,
	removed sed
List-Id: Tarantool development patches <tarantool-patches.dev.tarantool.org>
List-Unsubscribe: <https://lists.tarantool.org/mailman/options/tarantool-patches>, 
 <mailto:tarantool-patches-request@dev.tarantool.org?subject=unsubscribe>
List-Archive: <https://lists.tarantool.org/pipermail/tarantool-patches/>
List-Post: <mailto:tarantool-patches@dev.tarantool.org>
List-Help: <mailto:tarantool-patches-request@dev.tarantool.org?subject=help>
List-Subscribe: <https://lists.tarantool.org/mailman/listinfo/tarantool-patches>, 
 <mailto:tarantool-patches-request@dev.tarantool.org?subject=subscribe>
To: Alexander Tikhonov <avtikhon@tarantool.org>, Alexander Turenko <alexander.turenko@tarantool.org>
Cc: tarantool-patches@dev.tarantool.org

https://github.com/tarantool/bench-run/compare/tpcc_durability

load.sh script that was used before has been wirtten in such a manner
that it was hard to detect any errors during it's execution (not to
mention the fact that tpcc_load does not exit on any error).
Unfortunately this patch depends on a newer version of tarantool/tpcc
that exits on repetable errors, uses correct schemas for the latest
tarantool version and uses correct API from the latest tarantool
versions.
---
  benchs/tpcc/run.sh | 3 +--
  1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/benchs/tpcc/run.sh b/benchs/tpcc/run.sh
index fca7939..c27e4dc 100755
--- a/benchs/tpcc/run.sh
+++ b/benchs/tpcc/run.sh
@@ -13,7 +13,6 @@ killall tarantool tpcc_load 2>/dev/null || true
  sync && echo "sync passed" || echo "sync failed with error" $?
  echo 3 > /proc/sys/vm/drop_caches

-sed 's#box.sql#box#g' -i /opt/tpcc/create_table.lua
  $numaopts tarantool /opt/tpcc/create_table.lua &
  sleep 5

@@ -23,7 +22,7 @@ sleep 5
  tpcc_opts="-h localhost -P 3301 -d tarantool -u root -p '' -w 15"

  cd /opt/tpcc
-. /opt/tpcc/load.sh tarantool 15
+/opt/tpcc/tpcc_load $tpcc_opts

  $numaopts /opt/tpcc/tpcc_start $tpcc_opts -r10 -l${TIME} -i${TIME} 
 >tpcc_output.txt 2>/dev/null

-- 
2.7.4