getting some minor fixes out of my stash

This commit is contained in:
Travis Turner 2018-01-04 10:45:04 -06:00
parent 3631cfc314
commit e57c125c08
No known key found for this signature in database
GPG key ID: 7F08008DFD9314C9
2 changed files with 2 additions and 4 deletions

View file

@ -995,8 +995,6 @@ func (c *Cluster) generateResizeJobByAction(nodeAction nodeAction) (*ResizeJob,
toCluster.addNodeBasicSorted(nodeAction.uri)
}
pbSchema := c.Holder.EncodeSchema()
// multiIndex is a map of sources initialized with all the nodes in toCluster.
multiIndex := make(map[URI][]*internal.ResizeSource)
@ -1029,7 +1027,7 @@ func (c *Cluster) generateResizeJobByAction(nodeAction nodeAction) (*ResizeJob,
URI: u.Encode(),
Coordinator: encodeURI(c.Coordinator),
Sources: sources,
Schema: pbSchema, // Include the schema to ensure it's in sync on the receiving node.
Schema: c.Holder.EncodeSchema(), // Include the schema to ensure it's in sync on the receiving node.
ClusterStatus: c.Status(),
}
j.Instructions = append(j.Instructions, instr)

View file

@ -278,7 +278,7 @@ func (h *Holder) EncodeMaxSlices() *internal.MaxSlices {
}
}
// EncodeSchema creates and internal representation of schema.
// EncodeSchema creates an internal representation of schema.
func (h *Holder) EncodeSchema() *internal.Schema {
return &internal.Schema{
Indexes: EncodeIndexes(h.Indexes()),