Talking to a couple elasticsearch engineers at elasticon one suggestion for how to deal with our master node timeout on cluster state update issues was to compact multiple small indices into a single index. The suggested method was to use different field names for each type, such as title_aawiki, title_abwiki, etc. etc. This would allow to massively shrink the number of indices and shards the elasticsearch master needs to keep track of.