@@ -71,7 +71,8 @@ int32_t is_xml;
71
71
#define USAGE_STR "Usage: %s <VOLNAME> [bigger-file <FILE> | "\
72
72
"latest-mtime <FILE> | "\
73
73
"source-brick <HOSTNAME:BRICKNAME> [<FILE>] | "\
74
- "split-brain-info | info-summary]\n"
74
+ "split-brain-info | info-summary] [glusterd-sock <FILE>"\
75
+ "]\n"
75
76
76
77
typedef enum {
77
78
GLFSH_MODE_CONTINUE_ON_ERROR = 1 ,
@@ -1561,14 +1562,19 @@ main (int argc, char **argv)
1561
1562
char * path = NULL ;
1562
1563
char * file = NULL ;
1563
1564
char * op_errstr = NULL ;
1565
+ char * socket_filepath = NULL ;
1564
1566
gf_xl_afr_op_t heal_op = -1 ;
1565
1567
1566
1568
if (argc < 2 ) {
1567
1569
printf (USAGE_STR , argv [0 ]);
1568
1570
ret = -1 ;
1569
1571
goto out ;
1572
+ } else if (argc >= 4 ) {
1573
+ if (!strcmp (argv [argc - 2 ], "glusterd-sock" )) {
1574
+ socket_filepath = argv [argc - 1 ];
1575
+ argc = argc - 2 ;
1576
+ }
1570
1577
}
1571
-
1572
1578
volname = argv [1 ];
1573
1579
switch (argc ) {
1574
1580
case 2 :
@@ -1591,12 +1597,12 @@ main (int argc, char **argv)
1591
1597
}
1592
1598
break ;
1593
1599
case 4 :
1594
- if ((!strcmp (argv [2 ], "split-brain-info" ))
1595
- && (!strcmp (argv [3 ], "xml" ))) {
1600
+ if ((!strcmp (argv [2 ], "split-brain-info" )) &&
1601
+ (!strcmp (argv [3 ], "xml" ))) {
1596
1602
heal_op = GF_SHD_OP_SPLIT_BRAIN_FILES ;
1597
1603
is_xml = 1 ;
1598
- } else if ((!strcmp (argv [2 ], "info-summary" ))
1599
- && (!strcmp (argv [3 ], "xml" ))) {
1604
+ } else if ((!strcmp (argv [2 ], "info-summary" )) &&
1605
+ (!strcmp (argv [3 ], "xml" ))) {
1600
1606
heal_op = GF_SHD_OP_HEAL_SUMMARY ;
1601
1607
is_xml = 1 ;
1602
1608
} else if (!strcmp (argv [2 ], "bigger-file" )) {
@@ -1663,8 +1669,12 @@ main (int argc, char **argv)
1663
1669
fs -> ctx -> secure_mgmt = 1 ;
1664
1670
fs -> ctx -> ssl_cert_depth = glusterfs_read_secure_access_file ();
1665
1671
}
1666
-
1667
- ret = glfs_set_volfile_server (fs , "unix" , DEFAULT_GLUSTERD_SOCKFILE , 0 );
1672
+ if (socket_filepath != NULL ) {
1673
+ ret = glfs_set_volfile_server (fs , "unix" , socket_filepath , 0 );
1674
+ } else {
1675
+ ret = glfs_set_volfile_server (fs , "unix" ,
1676
+ DEFAULT_GLUSTERD_SOCKFILE , 0 );
1677
+ }
1668
1678
if (ret ) {
1669
1679
ret = - errno ;
1670
1680
gf_asprintf (& op_errstr , "Setting the volfile server failed, "
0 commit comments