Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Loading…

Rollback to 'Change order of ConsistencyMasterSlave parameters' #288

Merged
merged 1 commit into from

2 participants

@clementgarnier

This reverts commit 3333337, reversing
changes made to b3f0100.

@mlaflamm
Collaborator

+1

@clementgarnier clementgarnier merged commit 0dbb13c into from
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Feb 27, 2014
  1. @clementgarnier

    Revert "Merge pull request #287 from wajam/manu-undo-stupid-merge"

    clementgarnier authored
    This reverts commit 3333337, reversing
    changes made to b3f0100.
This page is out of date. Refresh to see the latest.
View
16 nrv-core/src/main/scala/com/wajam/nrv/consistency/ConsistencyMasterSlave.scala
@@ -37,13 +37,17 @@ import com.wajam.nrv.utils.timestamp.{Timestamp, TimestampGenerator}
*/
class ConsistencyMasterSlave(val timestampGenerator: TimestampGenerator,
val consistencyPersistence: ConsistencyPersistence,
- txLogDir: String, txLogEnabled: Boolean,
- txLogRolloverSize: Int = 50000000, txLogCommitFrequency: Int = 5000,
+ txLogDir: String,
+ txLogEnabled: Boolean,
+ txLogRolloverSize: Int = 50000000,
+ txLogCommitFrequency: Int = 5000,
timestampTimeoutExtraDelay: Int = 250,
- replicationTps: Int = 50, replicationWindowSize: Int = 20,
- replicationSessionIdleTimeout: Long = 30000L, replicationOpenSessionDelay: Long = 5000,
- replicationResolver: Option[Resolver] = None,
- maxReplicaLagSeconds: Int = 0)
+ maxReplicaLagSeconds: Int = 0,
+ replicationTps: Int = 50,
+ replicationWindowSize: Int = 20,
+ replicationSessionIdleTimeout: Long = 30000L,
+ replicationOpenSessionDelay: Long = 5000,
+ replicationResolver: Option[Resolver] = None)
extends Consistency with Logging {
import SlaveReplicationManagerProtocol._
Something went wrong with that request. Please try again.