Commit 7b75e89

authored

Add detach replica to shutdown function (#8688)

When apply segment using an external engine (Jaybird/UDR), the replica is not detached by nullifying the variable, because releaseAttachment is not called

1 parent ab7da95 commit 7b75e89Copy full SHA for 7b75e89

File tree

1 file changed

+16

-7

lines changed

src/remote/server
- ReplServer.cpp

1 file changed

+16

-7

lines changed

`‎src/remote/server/ReplServer.cpp‎`

Lines changed: 16 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -384,11 +384,11 @@ namespace`
`384`	`384`	`provider->attachDatabase(&localStatus, m_config->dbName.c_str(),`
`385`	`385`	`dpb.getBufferLength(), dpb.getBuffer());`
`386`	`386`	`localStatus.check();`
`387`		`- m_attachment.assignRefNoIncr(att);`
	`387`	`+ m_attachment = att;`
`388`	`388`
`389`	`389`	`const auto repl = m_attachment->createReplicator(&localStatus);`
`390`	`390`	`localStatus.check();`
`391`		`- m_replicator.assignRefNoIncr(repl);`
	`391`	`+ m_replicator = repl;`
`392`	`392`
`393`	`393`	`fb_assert(!m_sequence);`
`394`	`394`
`@@ -416,8 +416,17 @@ namespace`
`416`	`416`
`417`	`417`	`void shutdown()`
`418`	`418`	`{`
`419`		`- m_replicator = nullptr;`
`420`		`- m_attachment = nullptr;`
	`419`	`+ FbLocalStatus localStatus;`
	`420`	`+ if (m_replicator)`
	`421`	`+ {`
	`422`	`+ m_replicator->close(&localStatus);`
	`423`	`+ m_replicator = nullptr;`
	`424`	`+ }`
	`425`	`+ if (m_attachment)`
	`426`	`+ {`
	`427`	`+ m_attachment->detach(&localStatus);`
	`428`	`+ m_attachment = nullptr;`
	`429`	`+ }`
`421`	`430`	`m_sequence = 0;`
`422`	`431`	`m_connected = false;`
`423`	`432`	`}`
`@@ -437,7 +446,7 @@ namespace`
`437`	`446`
`438`	`447`	`bool isShutdown() const`
`439`	`448`	`{`
`440`		`- return (m_attachment == NULL);`
	`449`	`+ return (m_attachment == nullptr);`
`441`	`450`	`}`
`442`	`451`
`443`	`452`	`const PathName& getDirectory() const`
`@@ -495,8 +504,8 @@ namespace`
`495`	`504`
`496`	`505`	`private:`
`497`	`506`	`AutoPtr<const Replication::Config> m_config;`
`498`		`- RefPtr<IAttachment> m_attachment;`
`499`		`- RefPtr<IReplicator> m_replicator;`
	`507`	`+ IAttachment* m_attachment;`
	`508`	`+ IReplicator* m_replicator;`
`500`	`509`	`FB_UINT64 m_sequence;`
`501`	`510`	`bool m_connected;`
`502`	`511`	`string m_lastError;`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Commit 7b75e89

File tree

1 file changed

1 file changed

`‎src/remote/server/ReplServer.cpp‎`

0 commit comments