diff options
| author | Jeff Darcy <jdarcy@fb.com> | 2017-09-15 06:59:01 -0700 |
|---|---|---|
| committer | Jeff Darcy <jdarcy@fb.com> | 2017-09-15 13:47:01 -0700 |
| commit | 8dfdecf220d1c9365e1f8d6af9ead5e48c61e2eb (patch) | |
| tree | bccd5906be43cf81792248b06099006525ed0c27 /libglusterfs/src/glusterfs.h | |
| parent | e4b47b5d54644c398c424a99116a0cc37e4431d6 (diff) | |
Replace namespace/io-stats/io-threads with 3.6-fb versions
This rolls up multiple patches related to namespace identificaton and
throttling/QoS. This primarily includes the following, all by Michael
Goulet <mgoulet@fb.com>.
io-threads: Add weighted round robin queueing by namespace
https://phabricator.facebook.com/D5615269
io-threads: Add per-namespaces queue sizes to IO_THREADS_QUEUE_SIZE_KEY
https://phabricator.facebook.com/D5683162
io-threads: Implement better slot allocation algorithm
https://phabricator.facebook.com/D5683186
io-threads: Only enable weighted queueing on bricks
https://phabricator.facebook.com/D5700062
io-threads: Update queue sizes on drain
https://phabricator.facebook.com/D5704832
Fix parsing (-1) as default NS weight
https://phabricator.facebook.com/D5723383
Parts of the following patches have also been applied to satisfy
dependencies.
io-throttling: Calculate moving averages and throttle offending hosts
https://phabricator.fb.com/D2516161
Shreyas Siravara <sshreyas@fb.com>
Hook up ODS logging for FUSE clients.
https://phabricator.facebook.com/D3963376
Kevin Vigor <kvigor@fb.com>
Add the flag --skip-nfsd-start to skip the NFS daemon stating, even if
it is enabled
https://phabricator.facebook.com/D4575368
Alex Lorca <alexlorca@fb.com>
There are also some "standard" changes: dealing with code that moved,
reindenting to comply with Gluster coding standards, gf_uuid_xxx, etc.
This patch *does* revert some changes which have occurred upstream since
3.6; these will be re-applied as apppropriate on top of this new base.
Change-Id: I69024115da7a60811e5b86beae781d602bdb558d
Signed-off-by: Jeff Darcy <jdarcy@fb.com>
Diffstat (limited to 'libglusterfs/src/glusterfs.h')
| -rw-r--r-- | libglusterfs/src/glusterfs.h | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/libglusterfs/src/glusterfs.h b/libglusterfs/src/glusterfs.h index 0b033d8bfcf..f618c7aba19 100644 --- a/libglusterfs/src/glusterfs.h +++ b/libglusterfs/src/glusterfs.h @@ -331,7 +331,14 @@ static inline const char *fop_pri_to_string (gf_fop_pri_t pri) return FOP_PRI_STRINGS[pri]; } -const char *fop_enum_to_pri_string (glusterfs_fop_t fop); +iot_pri_t iot_fop_to_pri (glusterfs_fop_t fop); + +static inline const char *fop_enum_to_pri_string (glusterfs_fop_t fop) +{ + iot_pri_t pri = iot_fop_to_pri (fop); + return fop_pri_to_string (pri); +} + const char *fop_enum_to_string (glusterfs_fop_t fop); #define GF_SET_IF_NOT_PRESENT 0x1 /* default behaviour */ @@ -444,6 +451,8 @@ struct _cmd_args { #ifdef GF_LINUX_HOST_OS char *oom_score_adj; #endif + + char *stats_instance_name; }; typedef struct _cmd_args cmd_args_t; |