Add support for unassigned.node_left.delayed_timeout index setting (#262

) * Add support for unassigned.node_left.delayed_timeout index setting * Wrote to changelog * remove formating * remove examples/stack.yaml.lock * undid stack.yaml.lock * undid stack.yaml.lock again * undid stack.yaml.lock yet again
bitemyapp · Oct 22, 2019 · fc310b2 · fc310b2
1 parent 7ebbf13
commit fc310b2
Show file tree

Hide file tree

Showing 3 changed files with 50 additions and 31 deletions.
diff --git a/changelog.md b/changelog.md
@@ -6,6 +6,7 @@
 - @JoseD92
   - Removed the disused `Seminearring` class.
   - Added Docker Compose support.
+  - Add support for unassigned.node_left.delayed_timeout index setting
 - @Kheldar, @AlexeyRaga, @dsturnbull
   - Added support for BulkUpsert operations that allow for additional metadata.
 

diff --git a/src/Database/Bloodhound/Internal/Client.hs b/src/Database/Bloodhound/Internal/Client.hs
@@ -244,6 +244,8 @@ data UpdatableIndexSetting = NumberOfReplicas ReplicaCount
                            | MappingTotalFieldsLimit Int
                            | AnalysisSetting Analysis
                            -- ^ Analysis is not a dynamic setting and can only be performed on a closed index.
+                           | UnassignedNodeLeftDelayedTimeout NominalDiffTime
+                           -- ^ Sets a delay to the allocation of replica shards which become unassigned because a node has left, giving them chance to return. See <https://www.elastic.co/guide/en/elasticsearch/reference/5.6/delayed-allocation.html>
                            deriving (Eq, Show)
 
 attrFilterJSON :: NonEmpty NodeAttrFilter -> Value
@@ -292,6 +294,7 @@ instance ToJSON UpdatableIndexSetting where
   toJSON (BlocksMetaData x) = oPath ("blocks" :| ["metadata"]) x
   toJSON (MappingTotalFieldsLimit x) = oPath ("index" :| ["mapping","total_fields","limit"]) x
   toJSON (AnalysisSetting x) = oPath ("index" :| ["analysis"]) x
+  toJSON (UnassignedNodeLeftDelayedTimeout x) = oPath ("index" :| ["unassigned","node_left","delayed_timeout"]) (NominalDiffTimeJSON x)
 
 instance FromJSON UpdatableIndexSetting where
   parseJSON = withObject "UpdatableIndexSetting" parse
@@ -326,43 +329,45 @@ instance FromJSON UpdatableIndexSetting where
                 <|> blocksMetaData `taggedAt` ["blocks", "metadata"]
                 <|> mappingTotalFieldsLimit `taggedAt` ["index", "mapping", "total_fields", "limit"]
                 <|> analysisSetting `taggedAt` ["index", "analysis"]
+                <|> unassignedNodeLeftDelayedTimeout `taggedAt` ["index", "unassigned", "node_left", "delayed_timeout"]
             where taggedAt f ks = taggedAt' f (Object o) ks
           taggedAt' f v [] =
             f =<< (parseJSON v <|> parseJSON (unStringlyTypeJSON v))
           taggedAt' f v (k:ks) =
             withObject "Object" (\o -> do v' <- o .: k
                                           taggedAt' f v' ks) v
-          numberOfReplicas               = pure . NumberOfReplicas
-          autoExpandReplicas             = pure . AutoExpandReplicas
-          refreshInterval                = pure . RefreshInterval . ndtJSON
-          indexConcurrency               = pure . IndexConcurrency
-          failOnMergeFailure             = pure . FailOnMergeFailure
-          translogFlushThresholdOps      = pure . TranslogFlushThresholdOps
-          translogFlushThresholdSize     = pure . TranslogFlushThresholdSize
-          translogFlushThresholdPeriod   = pure . TranslogFlushThresholdPeriod . ndtJSON
-          translogDisableFlush           = pure . TranslogDisableFlush
-          cacheFilterMaxSize             = pure . CacheFilterMaxSize
-          cacheFilterExpire              = pure . CacheFilterExpire . fmap ndtJSON
-          gatewaySnapshotInterval        = pure . GatewaySnapshotInterval . ndtJSON
-          routingAllocationInclude       = fmap RoutingAllocationInclude . parseAttrFilter
-          routingAllocationExclude       = fmap RoutingAllocationExclude . parseAttrFilter
-          routingAllocationRequire       = fmap RoutingAllocationRequire . parseAttrFilter
-          routingAllocationEnable        = pure . RoutingAllocationEnable
-          routingAllocationShardsPerNode = pure . RoutingAllocationShardsPerNode
-          recoveryInitialShards          = pure . RecoveryInitialShards
-          gcDeletes                      = pure . GCDeletes . ndtJSON
-          ttlDisablePurge                = pure . TTLDisablePurge
-          translogFSType                 = pure . TranslogFSType
-          compressionSetting             = pure . CompressionSetting
-          compoundFormat                 = pure . IndexCompoundFormat
-          compoundOnFlush                = pure . IndexCompoundOnFlush
-          warmerEnabled                  = pure . WarmerEnabled
-          blocksReadOnly                 = pure . BlocksReadOnly
-          blocksRead                     = pure . BlocksRead
-          blocksWrite                    = pure . BlocksWrite
-          blocksMetaData                 = pure . BlocksMetaData
-          mappingTotalFieldsLimit        = pure . MappingTotalFieldsLimit
-          analysisSetting                = pure . AnalysisSetting
+          numberOfReplicas                 = pure . NumberOfReplicas
+          autoExpandReplicas               = pure . AutoExpandReplicas
+          refreshInterval                  = pure . RefreshInterval . ndtJSON
+          indexConcurrency                 = pure . IndexConcurrency
+          failOnMergeFailure               = pure . FailOnMergeFailure
+          translogFlushThresholdOps        = pure . TranslogFlushThresholdOps
+          translogFlushThresholdSize       = pure . TranslogFlushThresholdSize
+          translogFlushThresholdPeriod     = pure . TranslogFlushThresholdPeriod . ndtJSON
+          translogDisableFlush             = pure . TranslogDisableFlush
+          cacheFilterMaxSize               = pure . CacheFilterMaxSize
+          cacheFilterExpire                = pure . CacheFilterExpire . fmap ndtJSON
+          gatewaySnapshotInterval          = pure . GatewaySnapshotInterval . ndtJSON
+          routingAllocationInclude         = fmap RoutingAllocationInclude . parseAttrFilter
+          routingAllocationExclude         = fmap RoutingAllocationExclude . parseAttrFilter
+          routingAllocationRequire         = fmap RoutingAllocationRequire . parseAttrFilter
+          routingAllocationEnable          = pure . RoutingAllocationEnable
+          routingAllocationShardsPerNode   = pure . RoutingAllocationShardsPerNode
+          recoveryInitialShards            = pure . RecoveryInitialShards
+          gcDeletes                        = pure . GCDeletes . ndtJSON
+          ttlDisablePurge                  = pure . TTLDisablePurge
+          translogFSType                   = pure . TranslogFSType
+          compressionSetting               = pure . CompressionSetting
+          compoundFormat                   = pure . IndexCompoundFormat
+          compoundOnFlush                  = pure . IndexCompoundOnFlush
+          warmerEnabled                    = pure . WarmerEnabled
+          blocksReadOnly                   = pure . BlocksReadOnly
+          blocksRead                       = pure . BlocksRead
+          blocksWrite                      = pure . BlocksWrite
+          blocksMetaData                   = pure . BlocksMetaData
+          mappingTotalFieldsLimit          = pure . MappingTotalFieldsLimit
+          analysisSetting                  = pure . AnalysisSetting
+          unassignedNodeLeftDelayedTimeout = pure . UnassignedNodeLeftDelayedTimeout . ndtJSON
 
 data ReplicaBounds = ReplicasBounded Int Int
                    | ReplicasLowerBounded Int

diff --git a/tests/Test/Indices.hs b/tests/Test/Indices.hs
@@ -87,6 +87,19 @@ spec = do
                                     (IndexSettings (ShardCount 1) (ReplicaCount 0))
                                     (NE.toList updates))
 
+    it "allows unassigned.node_left.delayed_timeout to be set" $ when' (atleast es50) $ withTestEnv $ do
+      _ <- deleteExampleIndex
+      _ <- createExampleIndex
+      let updates = UnassignedNodeLeftDelayedTimeout 10 :| []
+      updateResp <- updateIndexSettings updates testIndex
+      liftIO $ validateStatus updateResp 200
+      getResp <- getIndexSettings testIndex
+      liftIO $
+        getResp `shouldBe` Right (IndexSettingsSummary
+                                    testIndex
+                                    (IndexSettings (ShardCount 1) (ReplicaCount 0))
+                                    (NE.toList updates))
+
     it "accepts customer analyzers" $ when' (atleast es50) $ withTestEnv $ do
       _ <- deleteExampleIndex
       let analysis = Analysis