[Gluster-devel] Question on merging zfs snapshot support into the mainline glusterfs

[B.K.Raghuram]

We had hosted some changes to an old version of glusterfs (3.6.1) in order
to incorporate ZFS snapshot support for gluster snapshot commands. These
have been done quite a while back and were not forward ported to newer
versions of glusterfs. I have a couple of questions on this :

1. If one needs to incorporate these changes in their current or modified
form into the glusterfs master, what is the procedure to do so?

2. Since the above process may take longer to roll in, we would like to get
the changes into at least the latest version of the 3.6 branch. In order to
do this, I tried the following and needed some help :

I tried to apply the two ZFS relates commits (
https://github.com/fractalio/glusterfs/commits/release-3.6) to the latest
gluster code in the  guster-3.6 branch. I hit  one merge conflict per
commit, both in xlators/mgmt/glusterd/src/glusterd-snapshot.c. The attached
glusterd-snapshot.c_1 is the file with the merge conflicts after applying
the first commit and  glusterd-snapshot.c_2 is the one applying the second
commit. In order to process, I removed the HEAD changes in each of the
merge conflicts and proceeded just to see if anything else breaks but it
went through. glusterd-snapshot.c_1_corrected and
glusterd-snapshot.c_2_corrected and the corresponding files after removing
the merge conflicts.

The question I had is, are the changes that I made to correct the merge
conflicts safe? If not, could someone provide some suggestions on how to
correct the two conflicts?

The file cmd_log contains the history of commands that I went through in
the process..

Thanks,
-Ram
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://www.gluster.org/pipermail/gluster-devel/attachments/20160620/7d7b7728/attachment-0001.html>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: cmd_log
Type: application/octet-stream
Size: 3536 bytes
Desc: not available
URL: <http://www.gluster.org/pipermail/gluster-devel/attachments/20160620/7d7b7728/attachment-0005.obj>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: glusterd-snapshot.c_1
Type: application/octet-stream
Size: 328713 bytes
Desc: not available
URL: <http://www.gluster.org/pipermail/gluster-devel/attachments/20160620/7d7b7728/attachment-0006.obj>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: glusterd-snapshot.c_1_corrected
Type: application/octet-stream
Size: 327631 bytes
Desc: not available
URL: <http://www.gluster.org/pipermail/gluster-devel/attachments/20160620/7d7b7728/attachment-0007.obj>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: glusterd-snapshot.c_2
Type: application/octet-stream
Size: 330541 bytes
Desc: not available
URL: <http://www.gluster.org/pipermail/gluster-devel/attachments/20160620/7d7b7728/attachment-0008.obj>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: glusterd-snapshot.c_2_corrected
Type: application/octet-stream
Size: 329167 bytes
Desc: not available
URL: <http://www.gluster.org/pipermail/gluster-devel/attachments/20160620/7d7b7728/attachment-0009.obj>