From patchwork Fri Aug 17 02:39:11 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Travis Rhoden X-Patchwork-Id: 1336161 Return-Path: X-Original-To: patchwork-ceph-devel@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 13AFB3FC33 for ; Fri, 17 Aug 2012 02:39:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756754Ab2HQCjd (ORCPT ); Thu, 16 Aug 2012 22:39:33 -0400 Received: from mail-qc0-f174.google.com ([209.85.216.174]:64658 "EHLO mail-qc0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755550Ab2HQCjc (ORCPT ); Thu, 16 Aug 2012 22:39:32 -0400 Received: by qcro28 with SMTP id o28so2731878qcr.19 for ; Thu, 16 Aug 2012 19:39:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:from:date:message-id:subject:to:content-type; bh=AU2JByZmSSp7xFybCfz6RTr6Xe5CfvestefyQHjN85E=; b=mOuDg+ItPmXCqQemHw1i2ED+p3xVl5wm+6nPp910Kk0Y8WgU7jwesE9J0mV+uPLLTe QkDUtcGcoSedQNTYXOCmFF3uqCB6Ys8Sr4sxKc+Vg7eFY7wHfScBx4rSDCi0YdY2dRwK rYOIzRFzQbvS7Ze+2s8g1GLOOb/xV3p1LnzW/gKfsWA6t4cHnbP54O0Y93S/MN5zXl/w p767XWdV3EMdINvsZ4YrOMkxrD7ALBYKUSL7sUEaq+TXsI5jnmVxDc0fLnFKLOj1mNSb LXZPuRBYs5PZS+hJyEpK5/DI9cyKwGfgmcf1V9yX7oq0dYkwKerIF9x9UUz+hM0UZwJ1 142w== Received: by 10.229.136.197 with SMTP id s5mr2390195qct.42.1345171171905; Thu, 16 Aug 2012 19:39:31 -0700 (PDT) MIME-Version: 1.0 Received: by 10.49.73.69 with HTTP; Thu, 16 Aug 2012 19:39:11 -0700 (PDT) From: Travis Rhoden Date: Thu, 16 Aug 2012 22:39:11 -0400 Message-ID: Subject: [PATCH] Use SSH in "service ceph status -a" to get version To: ceph-devel@vger.kernel.org Sender: ceph-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: ceph-devel@vger.kernel.org When running "service ceph status -a", a version number was never returned for remote hosts, only for the local. This was because the command to query the version number didn't use the do_cmd function, which is responsible for running the command over SSH when needed. Modify the ceph init.d script to use do_cmd for querying the Ceph version. Signed-off-by: Travis Rhoden --- src/init-ceph.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) elif [ -e "$pid_file" ]; then # daemon is dead, but pid file still exists -- 1.7.4.4 -- To unsubscribe from this list: send the line "unsubscribe ceph-devel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/src/init-ceph.in b/src/init-ceph.in index a8c5a29..31aeb28 100644 --- a/src/init-ceph.in +++ b/src/init-ceph.in @@ -298,7 +298,7 @@ for name in $what; do status) if daemon_is_running $name ceph-$type $id $pid_file; then get_conf asok "/var/run/ceph/ceph-$type.$id.asok" "admin socket" - version=`$BINDIR/ceph --admin-daemon $asok version 2>/dev/null || echo unknown` + version=`do_cmd "$BINDIR/ceph --admin-daemon $asok version 2>/dev/null" || echo unknown` echo "$name: running $version"