missing commits/fixes in 1.8.4

[cbonte]

The 1.8.4 version has just been released but some commits/patches have disappeared between 1.8.4-rc3 and 1.8.4-rc4.
A new 1.8.4 branch was created https://github.com/influxdata/influxdb/tree/1.8.4
whereas some fixes were provided in a 1.8 branch till 1.8.4-rc3 : https://github.com/influxdata/influxdb/tree/1.8

Also, the release note claims the 1.8.3 version was not released, which is not the case :
https://github.com/influxdata/influxdb/releases/tag/v1.8.4
https://www.influxdata.com/blog/release-announcement-influxdb-oss-2-0-3/

What happened to this 1.8.4 release ?

[superbool]

Also confused with "the 1.8.3 version was not released"，but the tag v1.8.3 who build it?

And which is the main branch of 1.x now?
It seems that master-1.x is behind of 1.8.4

Just very confused.🤔️

[cbonte]

Hi @davidby-influx, do you have any details about this ? Thanks.

[psteinbachs]

Apologies for the confusion on this, but I will attempt to clarify. The changelog note in 1.8.4 was intended for 1.8.3 Enterprise only which we need to correct, but we did indeed tag and release 1.8.3 OSS. We did not release 1.8.3 Enterprise due to a regression that could reduce write performance in some cases.

Between 1.8.3 and 1.8.4, we produced several RC builds that rolled back changes as part of identifying the regression (hence why the commits disappeared). With 1.8.4 out now, any commits that did not make it in are being re-evaluated for the 1.8.5 release. master-1.x appearing to be behind 1.8.4 is odd because that shouldn't be the case (we're looking into it further), and master-1.x is always meant to be the main branch for 1.x

[cbonte]

Hi @psteinbachs, this is still embarrassing because nothing has been done yet to cleanup the branches, but new commits are added to master-1.x. From the outside, it's really hard to understand any logic here.

[dgnorton]

@cbonte

...nothing has been done yet to cleanup the branches, but new commits are added to master-1.x...

Work is in progress to cleanup the 1.8.x issues. In parallel, there is new feature work happening on master-1.x.