<div dir="ltr"><div dir="ltr"><br><br><div class="gmail_quote"><div dir="ltr">On Fri, Oct 5, 2018 at 8:53 AM Amar Tumballi <<a href="mailto:atumball@redhat.com">atumball@redhat.com</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"><div dir="ltr"><div dir="ltr">Can you try below diff in your rfc, and let me know if it works?</div></div></blockquote><div><br></div><div>No. it didn't. I see the same error.<br> [rgowdapp@rgowdapp glusterfs]$ ./rfc.sh <br>+ rebase_changes<br>+ GIT_EDITOR=./rfc.sh<br>+ git rebase -i origin/master<br>[detached HEAD e50667e] cluster/dht: clang-format dht-common.c<br> 1 file changed, 10674 insertions(+), 11166 deletions(-)<br> rewrite xlators/cluster/dht/src/dht-common.c (88%)<br>[detached HEAD 0734847] cluster/dht: fixes to unlinking invalid linkto file<br> 1 file changed, 1 insertion(+), 1 deletion(-)<br>[detached HEAD 7aeba07] rfc.sh: test - DO NOT MERGE<br> 1 file changed, 8 insertions(+), 3 deletions(-)<br>Successfully rebased and updated refs/heads/1635145.<br>+ check_backport<br>+ moveon=N<br>+ '[' master = master ']'<br>+ return<br>+ assert_diverge<br>+ git diff origin/master..HEAD<br>+ grep -q .<br>++ git log -n1 --format=%b<br>++ grep -ow -E '([fF][iI][xX][eE][sS]|[uU][pP][dD][aA][tT][eE][sS])(:)?[[:space:]]+(gluster\/glusterfs)?(bz)?#[[:digit:]]+'<br>++ awk -F '#' '{print $2}'<br>+ reference=1635145<br>+ '[' -z 1635145 ']'<br>++ clang-format --version<br>+ clang_format='LLVM (<a href="http://llvm.org/">http://llvm.org/</a>):<br> LLVM version 3.4.2<br> Optimized build.<br> Built Dec 7 2015 (09:37:36).<br> Default target: x86_64-redhat-linux-gnu<br> Host CPU: x86-64'<br><br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"><div dir="ltr"><div dir="ltr"><div><br></div><div>```</div><div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"><font face="monospace, monospace">diff --git a/rfc.sh b/rfc.sh<br></font><font face="monospace, monospace">index 607fd7528f..4ffef26ca1 100755<br></font><font face="monospace, monospace">--- a/rfc.sh<br></font><font face="monospace, monospace">+++ b/rfc.sh<br></font><font face="monospace, monospace">@@ -321,21 +321,21 @@ main()<br></font><font face="monospace, monospace"> fi<br></font><font face="monospace, monospace"> <br></font><font face="monospace, monospace"> # TODO: add clang-format command here. It will after the changes are done everywhere else<br></font><font face="monospace, monospace">+ set +e<br></font><font face="monospace, monospace"> clang_format=$(clang-format --version)<br></font><font face="monospace, monospace"> if [ ! -z "${clang_format}" ]; then<br></font><font face="monospace, monospace"> # Considering git show may not give any files as output matching the<br></font><font face="monospace, monospace"> # criteria, good to tell script not to fail on error<br></font><font face="monospace, monospace">- set +e<br></font><font face="monospace, monospace"> list_of_files=$(git show --pretty="format:" --name-only |<br></font><font face="monospace, monospace"> grep -v "contrib/" | egrep --color=never "*\.[ch]$");<br></font><font face="monospace, monospace"> if [ ! -z "${list_of_files}" ]; then<br></font><font face="monospace, monospace"> echo "${list_of_files}" | xargs clang-format -i<br></font><font face="monospace, monospace"> fi<br></font><font face="monospace, monospace">- set -e<br></font><font face="monospace, monospace"> else<br></font><font face="monospace, monospace"> echo "High probability of your patch not passing smoke due to coding standard check"<br></font><font face="monospace, monospace"> echo "Please install 'clang-format' to format the patch before submitting"<br></font><font face="monospace, monospace"> fi<br></font><font face="monospace, monospace">+ set -e<br></font><font face="monospace, monospace"> <br></font><font face="monospace, monospace"> if [ "$DRY_RUN" = 1 ]; then<br></font><font face="monospace, monospace"> drier='echo -e Please use the following command to send your commits to review:\n\n'</font></blockquote></div><div>```</div><div>-Amar</div></div></div><br><div class="gmail_quote"><div dir="ltr">On Fri, Oct 5, 2018 at 8:09 AM Raghavendra Gowdappa <<a href="mailto:rgowdapp@redhat.com" target="_blank">rgowdapp@redhat.com</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"><div dir="ltr"><div dir="ltr"><div>All,</div><div><br></div><div>[rgowdapp@rgowdapp glusterfs]$ ./rfc.sh </div><div>+ rebase_changes</div><div>+ GIT_EDITOR=./rfc.sh</div><div>+ git rebase -i origin/master</div><div>[detached HEAD 34fabdd] cluster/dht: clang-format dht-common.c</div><div> 1 file changed, 10674 insertions(+), 11166 deletions(-)</div><div> rewrite xlators/cluster/dht/src/dht-common.c (88%)</div><div>[detached HEAD 4bbcbf9] cluster/dht: fixes to unlinking invalid linkto file</div><div> 1 file changed, 1 insertion(+), 1 deletion(-)</div><div>[detached HEAD c5583ea] rfc.sh: test - DO NOT MERGE</div><div> 1 file changed, 8 insertions(+), 3 deletions(-)</div><div>Successfully rebased and updated refs/heads/1635145.</div><div>+ check_backport</div><div>+ moveon=N</div><div>+ '[' master = master ']'</div><div>+ return</div><div>+ assert_diverge</div><div>+ git diff origin/master..HEAD</div><div>+ grep -q .</div><div>++ git log -n1 --format=%b</div><div>++ grep -ow -E '([fF][iI][xX][eE][sS]|[uU][pP][dD][aA][tT][eE][sS])(:)?[[:space:]]+(gluster\/glusterfs)?(bz)?#[[:digit:]]+'</div><div>++ awk -F '#' '{print $2}'</div><div>+ reference=1635145</div><div>+ '[' -z 1635145 ']'</div><div>++ clang-format --version</div><div>+ clang_format='LLVM (<a href="http://llvm.org/" target="_blank">http://llvm.org/</a>):</div><div> LLVM version 3.4.2</div><div> Optimized build.</div><div> Built Dec 7 2015 (09:37:36).</div><div> Default target: x86_64-redhat-linux-gnu</div><div> Host CPU: x86-64'</div><div><br></div><div>Looks like the script is exiting right after it completes clang-format --version. Nothing after that statement gets executed (did it crash? I don't see any cores). Any help is appreciated</div><div><br></div><div>regards,</div><div>Raghavendra</div><div><br></div></div></div>
_______________________________________________<br>
Gluster-devel mailing list<br>
<a href="mailto:Gluster-devel@gluster.org" target="_blank">Gluster-devel@gluster.org</a><br>
<a href="https://lists.gluster.org/mailman/listinfo/gluster-devel" rel="noreferrer" target="_blank">https://lists.gluster.org/mailman/listinfo/gluster-devel</a></blockquote></div><br clear="all"><div><br></div>-- <br><div dir="ltr" class="gmail-m_3799037434425350620gmail_signature"><div dir="ltr"><div><div dir="ltr"><div>Amar Tumballi (amarts)<br></div></div></div></div></div>
</blockquote></div></div></div>