git - Continuous integration workflow - emergency use cases -

-

let me first describe simple ci workflow (we use git, jenkins, maven, nexus): project, creates branch master branch, makes changes, verification , code review done. puts request change.

the following automated. changes merged master , queued release. deploy, every item in queue, binary built master branch (using tag or commit id), run test suite, , deploy 1% traffic. within 12 hours, have automatic analysis of performance numbers , business numbers, @ point give 100% traffic. pick next item in queue.

this separation of 1 change per 100% release important because becomes difficult debug wrong if multiple changes in 1 release.

this work fine, until breaks.

  • say push feature1 1% traffic, find numbers bad, , in 12 hours takes figure out, feature2 has been merged master. in case, git revert needs done on feature1, if want feature2 go , revert buggy feature1 till fix bugs.
  • in above case, feature1 important, , found wrong , know fix. need revert feature2 master, merge feature1 fix master , reset queue.
  • if there emergency fix outside of features, , production @ feature0 @ point, feature1 on pilot. want emergency fix on feature0 go 100%. time again need revert feature1 master.

is there workflow, using multiple branches instead of master or adding more automation, avoids git reverts - in cases 2 , 3 developer has finished his/her feature has done nothing wrong.

looks you're doing master. how git-flow-ish model using develop , release branches, plus separate branch each feature , each bugfix?

example of how work kind of scenarios mention:

9am production (100%) on release tag 1. feature finished branch featurea merged develop

10am daily rollout time ... merge develop release, take cut (tag 2) , roll out release tag 2 1%

11am finishes coding feature b , merges featureb develop

12 noon emergency! feature has bug. roll production (1%) tag 1. take branch release tag 2 (remember release branch not contain feature b), called bugfixa, , start working on fixing bug.

4pm bug fix gets signed off - merge bugfixa release, take cut (tag 3) , roll. merge bugfixa develop, , run tests against develop make sure bugfix doesn't clash feature b.

10am next day - rollout time! merge develop release, take tag 4 , push 1% - pushing feature b is

meanwhile somewhere tag 3 (containing feature , patch) passes 12-hour test , moves 100% ...


Comments

Post a Comment

Popular posts from this blog

c++ - Creating new partition disk winapi -

-
i'am trying create new partition , mount volume new, thought createfile let me this, code : lpctstr lpfilename=l"\\\\.\\device\\harddisk0\\partition3"; handle handl=createfile( lpfilename, generic_read | generic_write, file_share_read | file_share_write, null, create_always, file_attribute_normal, null ); if (handl==invalid_handle_value) { qdebug()<<"handl invalid"<<" error"<<getlasterror();} bool success = definedosdevice(ddd_raw_target_path,l"i:",l"\\device\\harddisk0\\partition3"); if(!success) qdebug()<<" definedosdevice failed "<<getlasterror(); bflag = getvolumenameforvolumemountpoint( l"i:\\", // input volume mount point or directory /** u in dir
Read more

Android Prevent Bluetooth Pairing Dialog -

-
i'm developing internal application uses bluetooth printing. want bluetooth pairing occur without user input. have managed working trapping android.bluetooth.device.action.pairing_request broadcast. in broadcast receiver call setpin method, , pairing works ok, bluetoothpairingdialog displayed second or two, disappears - see link below. https://github.com/android/platform_packages_apps_settings/blob/master/src/com/android/settings/bluetooth/bluetoothpairingdialog.java since broadcast non-ordered, can't call abortbroadcast() , , wondering if there other way prevent pairing dialog appearing. can hook window manager in way? i haven't been able come way without modifying sdk. if you're oem, it's easy (i'm on 4.3): in packages/apps/settings/androidmanifest.xml, comment intent filter pairing dialog: <activity android:name=".bluetooth.bluetoothpairingdialog" android:label="@string/bluetooth_pairing_request"
Read more

VBA function to include CDATA -

-
i have following function include cdata: function cdatasection() dim objdom domdocument dim objkmlrootelement ikmldomelement dim objkmlelement ikmldomelement dim cdata ikmldomcdatasection set objdom = new domdocument set objkmlrootelement = objdom.createelement("balloonstyle") objdom.appendchild objkmlrootelement set objkmlelement = objdom.createelement("text") objkmlrootelement.appendchild objkmlelement set cdata = objdom.createcdatasection("text") cdata.data = "<![cdata[<b>latitude = $[latitude]</b>?]]>;" end function when run above, getting error "user defined data type not found" function. yes ripster says find library reference. vba window tools>references for list of relevant references see... http://msdn.microsoft.com/en-us/library/windows/desktop/ms763701%28v=vs.85%29.aspx however, if have hard time tracking down reference, replace dim sta
Read more