diff mbox series

[5.4,074/123] ktest: Add timeout for ssh sync testing

Message ID	20200317103315.057778302@linuxfoundation.org
State	New
Headers	show Return-Path: <SRS0=f8y2=5C=vger.kernel.org=stable-owner@kernel.org> From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, stable@vger.kernel.org, "Steven Rostedt (VMware)" <rostedt@goodmis.org> Subject: [PATCH 5.4 074/123] ktest: Add timeout for ssh sync testing Date: Tue, 17 Mar 2020 11:55:01 +0100 Message-Id: <20200317103315.057778302@linuxfoundation.org> In-Reply-To: <20200317103307.343627747@linuxfoundation.org> References: <20200317103307.343627747@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk
Series	None \| expand [5.4,002/123] ALSA: hda/realtek - More constifications [5.4,003/123] ALSA: hda/realtek - Add Headset Mic supported for HP cPC [5.4,004/123] ALSA: hda/realtek - Fixed one of HP ALC671 platform Headset Mic supported [5.4,005/123] cgroup, netclassid: periodically release file_lock on classid updating [5.4,007/123] inet_diag: return classid for all socket types [5.4,009/123] ipvlan: add cond_resched_rcu() while processing muticast backlog [5.4,011/123] ipvlan: do not use cond_resched_rcu() in ipvlan_process_multicast() [5.4,012/123] ipvlan: dont deref eth hdr before checking its set [5.4,015/123] net: dsa: mv88e6xxx: fix lockup on warm boot [5.4,016/123] net: fec: validate the new settings in fec_enet_set_coalesce() [5.4,018/123] net/ipv6: use configured metric when add peer route [5.4,022/123] net/packet: tpacket_rcv: do not increment ring index on drop [5.4,023/123] net: phy: bcm63xx: fix OOPS due to missing driver name [5.4,025/123] net: systemport: fix index check to avoid an array out of bounds access [5.4,028/123] slip: make slhc_compress() more robust against malicious packets [5.4,031/123] bnxt_en: reinitialize IRQs when MTU is modified [5.4,032/123] bnxt_en: fix error handling when flashing from file [5.4,033/123] cgroup: memcg: net: do not associate sock with unrelated cgroup [5.4,034/123] net: memcg: late association of sock to memcg [5.4,035/123] net: memcg: fix lockdep splat in inet_csk_accept() [5.4,036/123] devlink: validate length of param values [5.4,039/123] nl802154: add missing attribute validation [5.4,042/123] macsec: add missing attribute validation for port [5.4,044/123] net: taprio: add missing attribute validation for txtime delay [5.4,045/123] team: add missing attribute validation for port ifindex [5.4,048/123] nfc: add missing attribute validation for SE API [5.4,052/123] net: phy: fix MDIO bus PM PHY resuming [5.4,053/123] net/ipv6: need update peer route when modify metric [5.4,056/123] net: dsa: Dont instantiate phylink for CPU/DSA ports unless needed [5.4,058/123] cgroup: cgroup_procs_next should increase position index [5.4,059/123] cgroup: Iterate tasks that did not finish do_exit() [5.4,062/123] virtio-blk: fix hw_queue stopped on arbitrary error [5.4,063/123] iommu/vt-d: quirk_ioat_snb_local_iommu: replace WARN_TAINT with pr_warn + add_taint [5.4,068/123] workqueue: dont use wq_select_unbound_cpu() for bound works [5.4,069/123] drm/amd/display: remove duplicated assignment to grph_obj_type [5.4,074/123] ktest: Add timeout for ssh sync testing [5.4,076/123] gfs2_atomic_open(): fix O_EXCL\|O_CREAT handling on cold dcache [5.4,079/123] ARC: define __ALIGN_STR and __ALIGN symbols for ARC [5.4,081/123] s390/dasd: fix data corruption for thin provisioned devices [5.4,083/123] blk-iocost: fix incorrect vtime comparison in iocg_is_idle() [5.4,085/123] macintosh: windfarm: fix MODINFO regression [5.4,087/123] efi: Fix a race and a buffer overflow while reading efivars via sysfs [5.4,088/123] efi: Add a sanity check to efivar_store_raw() [5.4,090/123] mt76: fix array overflow on receiving too many fragments for a packet [5.4,091/123] perf/amd/uncore: Replace manual sampling check with CAP_NO_INTERRUPT flag [5.4,092/123] x86/mce: Fix logic and comments around MSR_PPIN_CTL [5.4,095/123] iommu/vt-d: Fix RCU list debugging warnings [5.4,098/123] clk: imx8mn: Fix incorrect clock defines [5.4,099/123] pinctrl: meson-gxl: fix GPIOX sdio pins [5.4,101/123] virtio_ring: Fix mem leak with vring_new_virtqueue() [5.4,104/123] drm/i915/gvt: Fix unnecessary schedule timer when no vGPU exits [5.4,107/123] i2c: gpio: suppress error on probe defer [5.4,108/123] nl80211: add missing attribute validation for critical protocol indication [5.4,109/123] nl80211: add missing attribute validation for beacon report scanning [5.4,110/123] nl80211: add missing attribute validation for channel switch [5.4,111/123] perf bench futex-wake: Restore thread count default to online CPU count [5.4,113/123] netfilter: nft_payload: add missing attribute validation for payload csum flags [5.4,116/123] netfilter: nft_chain_nat: inet family is missing module ownership [5.4,117/123] iommu/vt-d: Fix the wrong printing in RHSA parsing [5.4,119/123] i2c: acpi: put device when verifying client fails [5.4,121/123] ipv6: restrict IPV6_ADDRFORM operation [5.4,123/123] net/smc: cancel event worker during device removal

Commit Message

Greg Kroah-Hartman March 17, 2020, 10:55 a.m. UTC

From: Steven Rostedt (VMware) <rostedt@goodmis.org>

commit 4d00fc477a2ce8b6d2b09fb34ef9fe9918e7d434 upstream.

Before rebooting the box, a "ssh sync" is called to the test machine to see
if it is alive or not. But if the test machine is in a partial state, that
ssh may never actually finish, and the ktest test hangs.

Add a 10 second timeout to the sync test, which will fail after 10 seconds
and then cause the test to reboot the test machine.

Cc: stable@vger.kernel.org
Fixes: 6474ace999edd ("ktest.pl: Powercycle the box on reboot if no connection can be made")
Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

---
 tools/testing/ktest/ktest.pl |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff mbox series

Patch

--- a/tools/testing/ktest/ktest.pl
+++ b/tools/testing/ktest/ktest.pl
@@ -1383,7 +1383,7 @@  sub reboot {
 
     } else {
 	# Make sure everything has been written to disk
-	run_ssh("sync");
+	run_ssh("sync", 10);
 
 	if (defined($time)) {
 	    start_monitor;