Skip to content

81816 clouseau for clustered purge improvements #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

81816 clouseau for clustered purge improvements #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a8c3c8e
Support clustered purge
chguocloudant Nov 30, 2016
8c462eb
Support clustered purge
chguocloudant Jan 3, 2017
6bd12a2
Update for set/get purge seq
chguocloudant Jan 9, 2017
f0d4c72
Update clouseau for clustered purge improvements
chguocloudant Feb 16, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions src/main/scala/com/cloudant/clouseau/ClouseauTypeFactory.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ case class UpdateDocMsg(id: String, doc: Document)
case class DeleteDocMsg(id: String)
case class CommitMsg(seq: Long)
case class SetUpdateSeqMsg(seq: Long)
case class SetPurgeSeqMsg(seq: Long)

object ClouseauTypeFactory extends TypeFactory {

Expand Down Expand Up @@ -89,6 +90,8 @@ object ClouseauTypeFactory extends TypeFactory {
Some(CommitMsg(toLong(reader.readTerm)))
case ('set_update_seq, 2) =>
Some(SetUpdateSeqMsg(toLong(reader.readTerm)))
case ('set_purge_seq, 2) =>
Some(SetPurgeSeqMsg(toLong(reader.readTerm)))
case _ =>
None
}
Expand Down
2 changes: 2 additions & 0 deletions src/main/scala/com/cloudant/clouseau/IndexManagerService.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,8 @@ class IndexManagerService(ctx: ServiceContext[ConfigurationArgs]) extends Servic
case pid =>
('ok, pid)
}
case ('get_root_dir) =>
('ok, rootDir.getAbsolutePath())
Copy link
Contributor

@mayya-sharipova mayya-sharipova Mar 17, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, it would be nice if you can provide a comment where this will be used.

case ('delete, path: String) =>
lru.get(path) match {
case null =>
Expand Down
39 changes: 30 additions & 9 deletions src/main/scala/com/cloudant/clouseau/IndexService.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,8 @@ class IndexService(ctx: ServiceContext[IndexServiceArgs]) extends Service(ctx) w
var reader = DirectoryReader.open(ctx.args.writer, true)
var updateSeq = getCommittedSeq
var pendingSeq = updateSeq
var purgeSeq = getCommittedPurgeSeq
var pendingPurgeSeq = purgeSeq
var committing = false
var forceRefresh = false

Expand Down Expand Up @@ -97,6 +99,8 @@ class IndexService(ctx: ServiceContext[IndexServiceArgs]) extends Service(ctx) w
group2(request)
case 'get_update_seq =>
('ok, updateSeq)
case 'get_purge_seq =>
('ok, purgeSeq)
case UpdateDocMsg(id: String, doc: Document) =>
logger.debug("Updating %s".format(id))
updateTimer.time {
Expand All @@ -117,6 +121,10 @@ class IndexService(ctx: ServiceContext[IndexServiceArgs]) extends Service(ctx) w
pendingSeq = newSeq
logger.debug("Pending sequence is now %d".format(newSeq))
'ok
case SetPurgeSeqMsg(newPurgeSeq: Long) =>
pendingPurgeSeq = newPurgeSeq
logger.debug("purge sequence is now %d".format(newPurgeSeq))
'ok
case 'info =>
('ok, getInfo)
}
Expand Down Expand Up @@ -148,12 +156,13 @@ class IndexService(ctx: ServiceContext[IndexServiceArgs]) extends Service(ctx) w
}
exit('deleted)
case 'maybe_commit =>
commit(pendingSeq)
case ('committed, newSeq: Long) =>
updateSeq = newSeq
commit(pendingSeq, pendingPurgeSeq)
case ('committed, newUpdateSeq: Long, newPurgeSeq: Long) =>
updateSeq = newUpdateSeq
purgeSeq = newPurgeSeq
forceRefresh = true
committing = false
logger.info("Committed sequence %d".format(newSeq))
logger.debug("Committed update sequence %d and purge sequence %d".format(newUpdateSeq, newPurgeSeq))
case 'commit_failed =>
committing = false
}
Expand All @@ -175,18 +184,19 @@ class IndexService(ctx: ServiceContext[IndexServiceArgs]) extends Service(ctx) w
}
}

private def commit(newSeq: Long) {
if (!committing && newSeq > updateSeq) {
private def commit(newUpdateSeq: Long, newPurgeSeq: Long) {
if (!committing && (newUpdateSeq > updateSeq || newPurgeSeq > purgeSeq)) {
committing = true
val index = self
node.spawn((_) => {
ctx.args.writer.setCommitData(ctx.args.writer.getCommitData +
("update_seq" -> newSeq.toString))
("update_seq" -> newUpdateSeq.toString) +
("purge_seq" -> newPurgeSeq.toString))
try {
commitTimer.time {
ctx.args.writer.commit()
}
index ! ('committed, newSeq)
index ! ('committed, newUpdateSeq, newPurgeSeq)
} catch {
case e: AlreadyClosedException =>
logger.error("Commit failed to closed writer", e)
Expand Down Expand Up @@ -569,7 +579,8 @@ class IndexService(ctx: ServiceContext[IndexServiceArgs]) extends Service(ctx) w
('doc_count, reader.numDocs),
('doc_del_count, reader.numDeletedDocs),
('pending_seq, pendingSeq),
('committed_seq, getCommittedSeq)
('committed_seq, getCommittedSeq),
('purge_seq, purgeSeq)
)
}

Expand All @@ -590,6 +601,16 @@ class IndexService(ctx: ServiceContext[IndexServiceArgs]) extends Service(ctx) w
}
}

private def getCommittedPurgeSeq = {
val commitData = ctx.args.writer.getCommitData
commitData.get("purge_seq") match {
case null =>
0L
case seq =>
seq.toLong
}
}

private def parseSort(v: Any): Sort = v match {
case 'relevance =>
Sort.RELEVANCE
Expand Down