<div dir="ltr"><div>Thanks Rajesh,<br><br></div>I was looking at 3.6 only to check on some locking issues that we were seeing. However, we would like to see this in master. Please feel free to suggest modifications/modify the code as you see fit. Are there plans of having a more general way of integrating other underlying snapshotting mechanisms such as btrfs/lxd as well?<br></div><div class="gmail_extra"><br><div class="gmail_quote">On Mon, Jun 20, 2016 at 3:16 PM, Rajesh Joseph <span dir="ltr"><<a href="mailto:rjoseph@redhat.com" target="_blank">rjoseph@redhat.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div dir="ltr"><br><div class="gmail_extra"><br><div class="gmail_quote"><div><div class="h5">On Mon, Jun 20, 2016 at 12:33 PM, Kaushal M <span dir="ltr"><<a href="mailto:kshlmster@gmail.com" target="_blank">kshlmster@gmail.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"><div><div>On Mon, Jun 20, 2016 at 11:38 AM, B.K.Raghuram <<a href="mailto:bkrram@gmail.com" target="_blank">bkrram@gmail.com</a>> wrote:<br>
> We had hosted some changes to an old version of glusterfs (3.6.1) in order<br>
> to incorporate ZFS snapshot support for gluster snapshot commands. These<br>
> have been done quite a while back and were not forward ported to newer<br>
> versions of glusterfs. I have a couple of questions on this :<br>
><br>
> 1. If one needs to incorporate these changes in their current or modified<br>
> form into the glusterfs master, what is the procedure to do so?<br>
><br>
> 2. Since the above process may take longer to roll in, we would like to get<br>
> the changes into at least the latest version of the 3.6 branch. In order to<br>
> do this, I tried the following and needed some help :<br>
><br>
> I tried to apply the two ZFS relates commits<br>
> (<a href="https://github.com/fractalio/glusterfs/commits/release-3.6" rel="noreferrer" target="_blank">https://github.com/fractalio/glusterfs/commits/release-3.6</a>) to the latest<br>
> gluster code in the guster-3.6 branch. I hit one merge conflict per<br>
> commit, both in xlators/mgmt/glusterd/src/glusterd-snapshot.c. The attached<br>
> glusterd-snapshot.c_1 is the file with the merge conflicts after applying<br>
> the first commit and glusterd-snapshot.c_2 is the one applying the second<br>
> commit. In order to process, I removed the HEAD changes in each of the merge<br>
> conflicts and proceeded just to see if anything else breaks but it went<br>
> through. glusterd-snapshot.c_1_corrected and glusterd-snapshot.c_2_corrected<br>
> and the corresponding files after removing the merge conflicts.<br>
><br>
> The question I had is, are the changes that I made to correct the merge<br>
> conflicts safe? If not, could someone provide some suggestions on how to<br>
> correct the two conflicts?<br>
><br>
> The file cmd_log contains the history of commands that I went through in the<br>
> process..<br>
><br>
<br>
</div></div>Thanks for sharing this Ram!<br>
<br>
Rajesh is the right person to answer your questions. As a GlusterD<br>
maintainer, I'll go through this and see if I can answer as well.<br>
<br></blockquote><div><br></div></div></div><div>Overall the merge resolution seems fine, except few mistakes. e.g. in glusterd-snapshot.c_2 you missed<br></div><div>to add "(unmount == _gf_true)" in the while loop in function "glusterd_do_lvm_snapshot_remove".<br><br></div><div>In function "glusterd_lvm_snapshot_remove" wrong chunk of code added. The "if" condition should break here<br></div><div>instead of continuing from here.<br> <br></div><div>Also I think it would be better to rebase the change against master instead of 3.6. <br><br></div><div>Apart from this I am yet to review the complete change. I have taken an initial look and seems like<br></div><div>we do need some amount of cleanup to the code before it can be taken in. I also need to see how well it will<br></div><div>work the existing framework. I will go through it and provide a detailed comments later.<br><br></div><div>Thanks & Regards,<br></div><div>Rajesh<br></div><span class=""><div><br> </div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">
> Thanks,<br>
> -Ram<br>
><br>
> _______________________________________________<br>
> Gluster-devel mailing list<br>
> <a href="mailto:Gluster-devel@gluster.org" target="_blank">Gluster-devel@gluster.org</a><br>
> <a href="http://www.gluster.org/mailman/listinfo/gluster-devel" rel="noreferrer" target="_blank">http://www.gluster.org/mailman/listinfo/gluster-devel</a><br>
</blockquote></span></div><br></div></div>
</blockquote></div><br></div>