From patchwork Tue May 31 13:04:45 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Hunter X-Patchwork-Id: 9144769 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 2247D60752 for ; Tue, 31 May 2016 13:04:50 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EEA642793B for ; Tue, 31 May 2016 13:04:49 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E319727E72; Tue, 31 May 2016 13:04:49 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BBF362793B for ; Tue, 31 May 2016 13:04:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752890AbcEaNEr (ORCPT ); Tue, 31 May 2016 09:04:47 -0400 Received: from mail-vk0-f67.google.com ([209.85.213.67]:33306 "EHLO mail-vk0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752026AbcEaNEq (ORCPT ); Tue, 31 May 2016 09:04:46 -0400 Received: by mail-vk0-f67.google.com with SMTP id m81so22403472vka.0 for ; Tue, 31 May 2016 06:04:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:date:message-id:subject:from:to; bh=/uo6OkTVfS2qEjTe/oNqHx4Bypbmx9f27yB2IPTCfJY=; b=IpN1gi9ZfTEXQDp/nP7xRi8dq8xT6vjdmatIT4TRcPQbVKp7bOvts4e7n7SISAAMxS ++ODcXoUdartXG662fSLMCSez2tsMu8NYa7guMMiE6hhvhmG1nOpnohhN4BfMHa/kZ3F 05FjJjn+rLOsaXShXJDWT8ow8Q5vCndKgKCIhPz+lW34+Tmk3nYed1tKRuPPBKsCnjKo Ym3zEYfXv80LLZLfAQfmDO+zULlKHotyi1uhFqjM/2TxEkJ4ZvZKaIr3BaayUnGExWQC cTQfpWwL2JHCJm8MqqjqgbwI8tzGVse76I7zCRitzFZTuVfqD4WWWzYGLeNjdG5wK/Vb J5Jw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:date:message-id:subject:from:to; bh=/uo6OkTVfS2qEjTe/oNqHx4Bypbmx9f27yB2IPTCfJY=; b=P6Ens1qhgTRtM+GOx+w/TiS7Pgq+2uIyeiaOB5wXQO0r26wA43t8ebdzmesRQmKEJg hggANAP4EgZRexngvAjzFZf4ASjAVlM6QmHzBARqWqqAlKx9Sg8gU1jrLCjVh8Cn1+kx Iez6HxTiwgPeLZDsQyAL4XHVfPmBcrtxIRgh+JE739BA/8z+pG43HP497Tzo3Tfs3XlE S/VyPbyHyxcDEo7wy1U0Rgv41Tknmxrk8JNLwqXMGLFgd2nGBlhTZVFJRDuptvLUavbq DG/FLElHo4fBv7f6lOWW3qg7CVnuK3C/xAH1YJvN+4vOVN/bMoGCcx4DTi0BHXjC8UNu cpPQ== X-Gm-Message-State: ALyK8tLQfY1J/C0QrD8CFTxPhj3sGahoQjZRQuLZiW5YU3JEWaocmAtavqbv2sX3T4dOTPeJt/PPfjDU2IyhMg== MIME-Version: 1.0 X-Received: by 10.176.69.142 with SMTP id u14mr16884038uau.101.1464699885277; Tue, 31 May 2016 06:04:45 -0700 (PDT) Received: by 10.176.6.229 with HTTP; Tue, 31 May 2016 06:04:45 -0700 (PDT) Date: Tue, 31 May 2016 21:04:45 +0800 Message-ID: Subject: [GSoC] wrong patch "msg: change entity_addr_t encode/decode" From: Junwang Zhao To: "Sage A. Weil" , Haomai Wang , Ceph Development Sender: ceph-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: ceph-devel@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Hi Sage & Haomai, I try to run './vstart.sh -d -x -n' to test the patches today, I got some error like 'wrong node', after some work, I found the error was introduced by this patch[0]. I change the code to use the legacy decode and encode, but got stuck somewhere. Can you please see the patch again and give some comments? [0]https://github.com/zhjwpku/ceph/commit/8934f038fdf28156038770e601e4a27f7a684390 Thanks, Zhao --- 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 --- a/src/msg/msg_types.h +++ b/src/msg/msg_types.h @@ -371,7 +371,7 @@ struct entity_addr_t { // broader study void encode(bufferlist& bl, uint64_t features) const { - if ((features & CEPH_FEATURE_MSG_ADDR2) == 0) { + if ((features & CEPH_FEATURE_MSG_ADDR2) != 0) { ::encode((__u32)0, bl); ::encode(nonce, bl); sockaddr_storage ss = get_sockaddr_storage();